Go to file
Christian Couder 823ea1211c bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting
It seems simpler and safer to use the BISECT_START file everywhere
to decide if we are bisecting or not, instead of using it in some
places and BISECT_NAMES in other places.

In commit 6459c7c678 (Nov 18 2007,
Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.),
we decided to use BISECT_NAMES but code changed a lot and we now
have to check BISECT_START first in the "bisect_start" function
anyway.

This patch also makes things a little bit safer by creating
the BISECT_START file first and deleting it last, and also by
adding checks in "bisect_clean_state".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-28 11:47:58 -07:00
Documentation Merge 1.5.5.3 in 2008-05-27 22:34:19 -07:00
arm
compat compat/fopen.c: avoid clobbering the system defined fopen macro 2008-05-08 17:43:01 -07:00
contrib hg-to-git: add --verbose option 2008-05-26 10:43:39 -07:00
git-gui Merge git://repo.or.cz/git-gui 2008-05-26 19:10:43 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-05-23 18:28:52 -07:00
gitweb Merge 1.5.5.3 in 2008-05-27 22:34:19 -07:00
mozilla-sha1
perl Git::cat_blob: allow using an empty blob to fix git-svn breakage 2008-05-27 23:35:55 -07:00
ppc
t builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value 2008-05-28 10:47:12 -07:00
templates Fix prepare-commit-msg hook and replace in-place sed 2008-05-21 09:45:53 -07:00
xdiff
.gitattributes
.gitignore
.mailmap
COPYING
GIT-VERSION-GEN GIT 1.5.5.3 2008-05-27 22:32:47 -07:00
INSTALL INSTALL: add a note about GNU interactive tools has been renamed 2008-05-05 16:53:54 -07:00
Makefile Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
README
RelNotes GIT 1.5.5.3 2008-05-27 22:32:47 -07:00
alias.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
alloc.c
archive-tar.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
archive-zip.c git-archive: ignore prefix when checking file attribute 2008-04-10 00:20:38 -07:00
archive.c archive.c: format_subst - fixed bogus argument to memchr 2008-04-22 21:23:16 -07:00
archive.h
attr.c gitattributes: Fix subdirectory attributes specified from root directory 2008-04-22 21:12:37 -07:00
attr.h
base85.c
blob.c
blob.h
branch.c Allow tracking branches to set up rebase by default. 2008-05-12 17:16:40 -07:00
branch.h
builtin-add.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-archive.c
builtin-blame.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-branch.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-bundle.c Always set *nongit_ok in setup_git_directory_gently() 2008-03-26 15:41:35 -07:00
builtin-cat-file.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-checkout.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-clean.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-clone.c clone: make sure we support the transport type 2008-05-27 21:30:16 -07:00
builtin-commit-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-commit.c Merge 1.5.5.3 in 2008-05-27 22:34:19 -07:00
builtin-config.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-count-objects.c
builtin-describe.c
builtin-diff-files.c Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
builtin-diff-index.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-diff-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-diff.c Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
builtin-fast-export.c Merge branch 'maint' 2008-05-25 22:43:05 -07:00
builtin-fetch--tool.c
builtin-fetch-pack.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-fetch.c builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value 2008-05-28 10:47:12 -07:00
builtin-fmt-merge-msg.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-for-each-ref.c
builtin-fsck.c
builtin-gc.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-grep.c add NO_EXTERNAL_GREP build option 2008-03-13 00:57:53 -07:00
builtin-http-fetch.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-init-db.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-log.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-ls-files.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-ls-remote.c Always set *nongit_ok in setup_git_directory_gently() 2008-03-26 15:41:35 -07:00
builtin-ls-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-mailinfo.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-mailsplit.c mailsplit: minor clean-up in read_line_with_nul() 2008-05-25 13:23:57 -07:00
builtin-merge-base.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-merge-file.c Merge branch 'maint' 2008-03-14 00:16:42 -07:00
builtin-merge-ours.c
builtin-merge-recursive.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-mv.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-name-rev.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-pack-objects.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c builtin-prune: protect objects listed on the command line 2008-03-27 15:39:57 -07:00
builtin-push.c Add a remote.*.mirror configuration option 2008-04-20 18:49:22 -07:00
builtin-read-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-reflog.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-remote.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-rerere.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-reset.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-rev-list.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-rev-parse.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-revert.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-rm.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-send-pack.c add special "matching refs" refspec 2008-05-04 17:41:39 -07:00
builtin-shortlog.c Merge branch 'maint-1.5.4' into maint 2008-04-12 15:41:19 -07:00
builtin-show-branch.c Merge branch 'maint' 2008-05-26 19:49:01 -07:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-tag.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-tar-tree.c
builtin-unpack-objects.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-update-index.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-update-ref.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-upload-archive.c
builtin-verify-pack.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-verify-tag.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-write-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin.h Merge branch 'js/mailinfo' 2008-05-25 14:05:09 -07:00
bundle.c
bundle.h
cache-tree.c Merge branch 'maint-1.5.4' into maint 2008-04-24 21:50:48 -07:00
cache-tree.h
cache.h Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
check-builtins.sh
check-racy.c
color.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
color.h Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
combine-diff.c Cleanup xread() loops to use read_in_full() 2008-05-03 22:15:25 -07:00
command-list.txt
commit.c
commit.h log: teach "terminator" vs "separator" mode to "--pretty=format" 2008-04-10 03:25:03 -07:00
config.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
config.mak.in autoconf: Test FREAD_READS_DIRECTORIES 2008-03-11 02:10:43 -07:00
configure.ac autoconf: Test FREAD_READS_DIRECTORIES 2008-03-11 02:10:43 -07:00
connect.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
convert.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
copy.c copy.c: copy_fd - correctly report write errors 2008-04-22 21:21:08 -07:00
csum-file.c
csum-file.h
ctype.c
daemon.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c "git diff": do not ignore index without --no-index 2008-05-24 00:16:39 -07:00
diff-no-index.c git diff --no-index: default to page like other diff frontends 2008-05-26 22:35:07 -07:00
diff.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
diff.h Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diff: make "too many files" rename warning optional 2008-05-03 13:40:43 -07:00
diffcore.h
dir.c Merge branch 'lt/case-insensitive' 2008-05-10 18:14:28 -07:00
dir.h
dump-cache-tree.c
entry.c Fix possible Solaris problem in 'checkout_entry()' 2008-03-18 22:18:57 -07:00
environment.c Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl add--interactive: allow user to choose mode update 2008-03-27 13:54:57 -07:00
git-am.sh Merge branch 'maint-1.5.4' into maint 2008-05-21 14:27:59 -07:00
git-archimport.perl
git-bisect.sh bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting 2008-05-28 11:47:58 -07:00
git-compat-util.h compat-util: avoid macro redefinition warning 2008-05-08 17:47:25 -07:00
git-cvsexportcommit.perl Merge branch 'js/cvsexportcommit' 2008-05-25 13:37:20 -07:00
git-cvsimport.perl Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them. 2008-05-25 13:06:49 -07:00
git-cvsserver.perl git-cvsserver: add ability to guess -kb from contents 2008-05-16 12:05:35 -07:00
git-filter-branch.sh Merge 1.5.5.3 in 2008-05-27 22:34:19 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh git-merge-one-file: fix longstanding stupid thinko 2008-03-18 22:17:17 -07:00
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh git-merge: exclude unnecessary options from OPTIONS_SPEC 2008-05-21 12:54:49 -07:00
git-mergetool.sh mergetool: Make ECMerge use the settings as specified by the user in the GUI 2008-05-11 10:12:19 -07:00
git-parse-remote.sh
git-pull.sh pull --rebase: exit early when the working directory is dirty 2008-05-22 23:05:11 -07:00
git-quiltimport.sh quiltimport: fix misquoting of parsed -p<num> parameter 2008-03-12 21:07:19 -07:00
git-rebase--interactive.sh Ignore dirty submodule states during rebase and stash 2008-05-15 16:12:43 -07:00
git-rebase.sh Ignore dirty submodule states during rebase and stash 2008-05-15 16:12:43 -07:00
git-relink.perl
git-repack.sh Merge branch 'bc/repack' 2008-05-23 16:06:01 -07:00
git-request-pull.sh
git-send-email.perl Merge branch 'jk/maint-send-email-compose' into maint 2008-05-25 22:34:23 -07:00
git-sh-setup.sh
git-stash.sh Ignore dirty submodule states during rebase and stash 2008-05-15 16:12:43 -07:00
git-submodule.sh submodule update: add convenience option --init 2008-05-16 13:03:55 -07:00
git-svn.perl Git::cat_blob: allow using an empty blob to fix git-svn breakage 2008-05-27 23:35:55 -07:00
git-web--browse.sh web--browse: use custom commands defined at config time 2008-03-14 00:31:06 -07:00
git.c Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
git.spec.in
graph.c get_revision(): honor the topo_order flag for boundary commits 2008-05-25 12:22:24 -07:00
graph.h log --graph --left-right: show left/right information in place of '*' 2008-05-25 12:06:52 -07:00
grep.c
grep.h
hash-object.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
hash.c
hash.h
help.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
http-push.c http-push: remove remote locks on exit signals 2008-05-25 13:07:24 -07:00
http-walker.c Make walker.fetch_ref() take a struct ref. 2008-04-26 17:36:17 -07:00
http.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
http.h Make walker.fetch_ref() take a struct ref. 2008-04-26 17:36:17 -07:00
ident.c commit: Show committer if automatic 2008-05-06 16:50:17 -07:00
imap-send.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
index-pack.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
interpolate.c
interpolate.h
list-objects.c
list-objects.h
ll-merge.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
ll-merge.h
lockfile.c Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
log-tree.c log --graph --left-right: show left/right information in place of '*' 2008-05-25 12:06:52 -07:00
log-tree.h Remove dead code: show_log() sep argument and diff_options.msg_sep 2008-05-03 11:48:03 -07:00
mailmap.c
mailmap.h
match-trees.c
merge-file.c
merge-index.c
merge-recursive.h
merge-tree.c
mktag.c mktag.c: tweak validation of tagger field and adjust test script 2008-03-31 22:43:34 -07:00
mktree.c
name-hash.c Make hash_name_lookup able to do case-independent lookups 2008-04-09 01:22:25 -07:00
object.c
object.h
pack-check.c
pack-redundant.c
pack-revindex.c
pack-revindex.h
pack-write.c Cleanup xread() loops to use read_in_full() 2008-05-03 22:15:25 -07:00
pack.h
pager.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
parse-options.c Merge branch 'maint-1.5.4' into maint 2008-04-10 00:29:33 -07:00
parse-options.h parse-options.c: introduce OPT_DATE 2008-03-27 13:55:15 -07:00
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path-list.c
path-list.h
path.c Make read_in_full() and write_in_full() consistent with xread() and xwrite() 2008-04-29 23:11:57 -07:00
pkt-line.c Cleanup xread() loops to use read_in_full() 2008-05-03 22:15:25 -07:00
pkt-line.h
pretty.c log --pretty: do not accept bogus "--prettyshort" 2008-05-25 20:29:07 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'jc/add-n-u' 2008-05-25 14:03:50 -07:00
receive-pack.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
refs.h Allow for having for_each_ref() list extra refs 2008-05-04 17:41:44 -07:00
remote.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
remote.h Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
revision.c log --pretty: do not accept bogus "--prettyshort" 2008-05-25 20:29:07 -07:00
revision.h log and rev-list: add --graph option 2008-05-05 18:46:35 -07:00
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
sha1-lookup.c sha1-lookup: make selection of 'middle' less aggressive 2008-04-09 01:30:18 -07:00
sha1-lookup.h sha1-lookup: more memory efficient search in sorted list of SHA-1 2008-04-09 01:23:52 -07:00
sha1_file.c fix sha1_pack_index_name() 2008-05-28 10:24:32 -07:00
sha1_name.c Merge branch 'maint-1.5.4' into maint 2008-04-29 22:55:07 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
strbuf.c
strbuf.h
symlinks.c Optimize symlink/directory detection 2008-05-10 18:16:31 -07:00
tag.c
tag.h
tar.h
test-absolute-path.c
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-sha1.c
test-sha1.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
thread-utils.c
thread-utils.h
trace.c
transport.c Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
transport.h Mark the list of refs to fetch as const 2008-05-04 17:41:44 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
unpack-trees.c unpack-trees: allow Porcelain to give different error messages 2008-05-19 19:30:13 -07:00
unpack-trees.h unpack-trees: allow Porcelain to give different error messages 2008-05-19 19:30:13 -07:00
update-server-info.c
upload-pack.c
usage.c
utf8.c
utf8.h
var.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
walker.c alloc_ref_from_str(): factor out a common pattern of alloc_ref from string 2008-05-11 09:04:37 -07:00
walker.h Make walker.fetch_ref() take a struct ref. 2008-04-26 17:36:17 -07:00
write_or_die.c Make read_in_full() and write_in_full() consistent with xread() and xwrite() 2008-04-29 23:11:57 -07:00
ws.c
wt-status.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
wt-status.h Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
xdiff-interface.c Merge branch 'maint' 2008-03-14 00:16:42 -07:00
xdiff-interface.h

README

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.
See Documentation/tutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands,
and "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

Many Git online resources are accessible from http://git.or.cz/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.