Go to file
Jay Soffian 3c7b480a1c bash completion: refactor --strategy completion
The code to complete --strategy was duplicated between _git_rebase and
_git_merge, and is about to gain a third caller (_git_pull). This patch
factors it into its own function.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-07 20:23:09 -08:00
Documentation Update draft release notes to 1.6.3 2009-03-06 01:37:22 -08:00
arm
compat Brown paper bag fix for MinGW 64-bit stat 2009-03-07 12:22:13 -08:00
contrib bash completion: refactor --strategy completion 2009-03-07 20:23:09 -08:00
git-gui Merge git://repo.or.cz/git-gui 2008-12-17 21:56:48 -08:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-03-01 22:20:52 -08:00
gitweb gitweb: Hyperlink multiple git hashes on the same commit message line 2009-02-19 22:49:55 -08:00
mozilla-sha1
perl Merge branch 'pb/maint-git-pm-false-dir' into maint 2009-01-23 19:02:41 -08:00
ppc
t Merge branch 'ns/pretty-format' 2009-03-05 15:41:43 -08:00
templates Modify description file to say what this file is 2009-03-04 00:56:52 -08:00
xdiff Merge branch 'kc/maint-diff-bwi-fix' into maint 2009-02-05 17:52:22 -08:00
.gitattributes
.gitignore Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
.mailmap
COPYING
GIT-VERSION-GEN GIT 1.6.2 2009-03-03 23:37:19 -08:00
INSTALL Add support for a pdf version of the user manual 2008-12-10 19:17:43 -08:00
Makefile Install builtins with the user and group of the installing personality 2009-02-24 21:46:31 -08:00
README README: fix path to "gitcvs-migration.txt" and be more consistent 2009-02-25 00:49:54 -08:00
RelNotes Beginning of 1.6.3 development track 2009-03-04 00:41:49 -08:00
abspath.c make_absolute_path(): check bounds when seeing an overlong symlink 2008-12-17 13:36:34 -08:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c git-archive: add --output=<file> to send output to a file 2009-03-04 00:56:52 -08:00
archive.h
attr.c
attr.h
base85.c
blob.c
blob.h
branch.c Teach the "@{-1} syntax to "git branch" 2009-02-13 23:46:28 -08:00
branch.h
builtin-add.c git add: trivial codestyle cleanup 2009-02-25 00:49:54 -08:00
builtin-annotate.c
builtin-apply.c Merge branch 'jc/maint-apply-fix' into maint 2009-02-05 18:06:11 -08:00
builtin-archive.c
builtin-blame.c Merge branch 'jc/blame' 2009-03-05 15:41:43 -08:00
builtin-branch.c Merge branch 'js/branch-symref' 2009-03-05 15:41:35 -08:00
builtin-bundle.c
builtin-cat-file.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c Fix neglect of diff_setup()/diff_setup_done() symmetry. 2009-03-04 00:56:51 -08:00
builtin-clean.c
builtin-clone.c Install the default "master" branch configuration after cloning a void 2009-02-12 22:37:35 -08:00
builtin-commit-tree.c
builtin-commit.c Generalize and libify index_is_dirty() to index_differs_from(...) 2009-02-10 22:25:39 -08:00
builtin-config.c git config: trivial cleanup for editor action 2009-02-21 20:35:48 -08:00
builtin-count-objects.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
builtin-describe.c Merge branch 'sp/maint-describe-all-tag-warning' into maint 2008-12-27 14:21:15 -08:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c reorder ALLOW_TEXTCONV option setting 2008-12-07 19:59:25 -08:00
builtin-fast-export.c Merge branch 'maint-1.6.0' into maint 2009-02-11 18:32:37 -08:00
builtin-fetch--tool.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
builtin-fetch-pack.c
builtin-fetch.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c fsck: check loose objects from alternate object stores by default 2009-01-30 19:23:22 -08:00
builtin-gc.c gc: make --prune useful again by accepting an optional parameter 2009-02-14 21:14:07 -08:00
builtin-grep.c Merge branch 'maint-1.6.0' into maint 2009-02-03 00:32:29 -08:00
builtin-help.c Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX) 2009-01-26 00:26:05 -08:00
builtin-http-fetch.c
builtin-init-db.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-log.c Enable setting attach as the default in .gitconfig for git-format-patch. 2009-02-12 14:48:43 -08:00
builtin-ls-files.c Let ls-files strip trailing slashes in submodules' paths 2009-02-07 12:49:50 -08:00
builtin-ls-remote.c
builtin-ls-tree.c tree.c: allow read_tree_recursive() to traverse gitlink entries 2009-02-07 12:14:34 -08:00
builtin-mailinfo.c mailinfo: cleanup extra spaces for complex 'From:' 2009-02-01 12:11:15 -08:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c merge-file: handle freopen() failure 2008-12-26 19:10:02 -08:00
builtin-merge-ours.c
builtin-merge-recursive.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-merge.c Teach @{-1} to git merge 2009-02-13 23:46:42 -08:00
builtin-mv.c builtin-mv.c: check for unversionned files before looking at the destination. 2009-02-04 11:07:42 -08:00
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'jc/maint-1.6.0-pack-directory' 2009-02-25 14:50:05 -08:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
builtin-push.c
builtin-read-tree.c
builtin-receive-pack.c improve missing repository error message 2009-03-04 20:37:21 -08:00
builtin-reflog.c
builtin-remote.c remote prune: warn dangling symrefs 2009-02-10 22:26:20 -08:00
builtin-rerere.c rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
builtin-reset.c
builtin-rev-list.c rev-list: estimate number of bisection step left 2009-03-04 00:56:52 -08:00
builtin-rev-parse.c
builtin-revert.c Generalize and libify index_is_dirty() to index_differs_from(...) 2009-02-10 22:25:39 -08:00
builtin-rm.c
builtin-send-pack.c send-pack: do not send unknown object name from ".have" to pack-objects 2009-01-27 23:46:59 -08:00
builtin-shortlog.c Change current mailmap usage to do matching on both name and email of author/committer. 2009-02-08 12:36:54 -08:00
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c symbolic-ref: allow refs/<whatever> in HEAD 2009-02-13 18:20:44 -08:00
builtin-tag.c git-tag: Add --contains option 2009-01-28 11:33:51 -08:00
builtin-tar-tree.c
builtin-unpack-objects.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
builtin-update-index.c Merge branch 'maint' 2009-02-19 23:44:07 -08:00
builtin-update-ref.c
builtin-upload-archive.c improve missing repository error message 2009-03-04 20:37:21 -08:00
builtin-verify-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-verify-tag.c
builtin-write-tree.c
builtin.h
bundle.c Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Support 'raw' date format 2009-02-20 21:45:42 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c Clean up use of ANSI color sequences 2009-02-13 17:27:58 -08:00
color.h Clean up use of ANSI color sequences 2009-02-13 17:27:58 -08:00
combine-diff.c combine-diff.c: use strbuf_readlink() 2008-12-17 13:36:35 -08:00
command-list.txt Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
commit.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
commit.h Make has_commit() non-static 2009-01-28 11:33:03 -08:00
config.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
config.mak.in config.mak.in: define paths without trailing slash 2009-02-05 00:29:23 -08:00
configure.ac Fix naming scheme for configure cache variables. 2009-01-21 00:12:25 -08:00
connect.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
convert.c
copy.c
csum-file.c
csum-file.h
ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
daemon.c improve missing repository error message 2009-03-04 20:37:21 -08:00
date.c never fallback relative times to absolute 2009-02-25 00:44:43 -08:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Generalize and libify index_is_dirty() to index_differs_from(...) 2009-02-10 22:25:39 -08:00
diff-no-index.c Merge branch 'maint' 2009-02-18 11:31:52 -08:00
diff.c Merge branch 'al/ansi-color' 2009-03-05 15:41:19 -08:00
diff.h Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking 2009-03-04 00:56:51 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Rename detection: Avoid repeated filespec population 2009-01-21 00:14:12 -08:00
diffcore.h
dir.c Merge branch 'fg/exclude-bq' 2009-03-05 15:41:39 -08:00
dir.h Allow cloning to an existing empty directory 2009-01-11 13:26:29 -08:00
editor.c
entry.c Merge branch 'kb/lstat-cache' 2009-01-25 17:13:34 -08:00
environment.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
exec_cmd.c system_path(): simplify using strip_path_suffix(), and add suffix "git" 2009-02-19 22:47:39 -08:00
exec_cmd.h Refactor git_set_argv0_path() to git_extract_argv0_path() 2009-01-26 00:26:05 -08:00
fast-import.c Merge branch 'jc/maint-1.6.0-pack-directory' 2009-02-25 14:50:05 -08:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'jc/add-p-unquote' 2009-03-05 15:41:41 -08:00
git-am.sh git-am: make --abort less dangerous 2009-02-26 23:06:38 -08:00
git-archimport.perl
git-bisect.sh rev-list: estimate number of bisection step left 2009-03-04 00:56:52 -08:00
git-compat-util.h Merge branch 'jc/maint-1.6.0-pack-directory' 2009-02-25 14:50:05 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: run post-update hook *after* update. 2009-01-30 21:11:46 -08:00
git-filter-branch.sh Improve error message for git-filter-branch 2009-03-04 00:56:52 -08:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool.sh Merge branch 'cb/mergetool' 2009-02-05 19:40:35 -08:00
git-parse-remote.sh
git-pull.sh disallow providing multiple upstream branches to rebase, pull --rebase 2009-02-18 11:14:04 -08:00
git-quiltimport.sh git-quiltimport: preserve standard input to be able to read user input 2009-02-25 00:49:13 -08:00
git-rebase--interactive.sh Merge branch 'js/maint-rebase-i-submodule' 2009-01-31 18:07:55 -08:00
git-rebase.sh Merge branch 'sr/force-rebase' 2009-03-05 15:41:40 -08:00
git-relink.perl
git-repack.sh Make repack less likely to corrupt repository 2009-02-11 18:32:16 -08:00
git-request-pull.sh
git-send-email.perl send-email: add --confirm option and configuration setting 2009-03-02 23:46:53 -08:00
git-sh-setup.sh git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree 2009-02-07 00:45:29 -08:00
git-stash.sh
git-submodule.sh Merge branch 'ff/submodule-no-fetch' 2009-02-15 01:44:20 -08:00
git-svn.perl git-svn - return original format_svn_date semantics 2009-02-27 21:53:43 -08:00
git-web--browse.sh git-web--browse: Fix check for /bin/start 2009-02-09 00:06:36 -08:00
git.c Merge branch 'jk/maint-cleanup-after-exec-failure' 2009-02-03 00:26:12 -08:00
git.spec.in Merge branch 'maint-1.6.0' into maint 2009-02-05 19:38:58 -08:00
graph.c
graph.h
grep.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
grep.h grep: don't call regexec() for fixed strings 2009-01-09 21:35:56 -08:00
hash-object.c Merge branch 'en/maint-hash-object' 2009-03-05 15:58:42 -08:00
hash.c
hash.h
help.c
help.h
http-push.c Merge branch 'rc/http-push' 2009-02-15 01:43:57 -08:00
http-walker.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
http.c
http.h
ident.c
imap-send.c imap.preformattedHTML to tell Thunderbird to send non-flowed text 2009-02-15 00:32:57 -08:00
index-pack.c Merge branch 'jc/maint-1.6.0-pack-directory' 2009-02-25 14:50:05 -08:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c Make the 'lock file' exists error more informative 2009-03-04 20:35:19 -08:00
log-tree.c log: do not print ellipses with --abbrev-commit 2009-02-13 17:18:22 -08:00
log-tree.h
mailmap.c Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
mailmap.h Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
match-trees.c
merge-file.c
merge-index.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
merge-recursive.c tree.c: allow read_tree_recursive() to traverse gitlink entries 2009-02-07 12:14:34 -08:00
merge-recursive.h
merge-tree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktag.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
name-hash.c
object.c bundle: allow the same ref to be given more than once 2009-01-17 23:00:31 -08:00
object.h Merge branch 'js/maint-all-implies-HEAD' into maint 2009-02-05 17:54:12 -08:00
pack-check.c
pack-redundant.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c Merge branch 'jc/maint-1.6.0-pack-directory' 2009-02-25 14:50:05 -08:00
pack.h
pager.c pager: do wait_for_pager on signal death 2009-01-21 22:46:53 -08:00
parse-options.c Make opt_parse_with_commit() non-static 2009-01-28 11:32:27 -08:00
parse-options.h Make opt_parse_with_commit() non-static 2009-01-28 11:32:27 -08:00
patch-delta.c
patch-id.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
patch-ids.c
patch-ids.h
path.c Introduce the function strip_path_suffix() 2009-02-19 22:45:48 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'ns/pretty-format' 2009-03-05 15:41:43 -08:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c add -u: do not fail to resolve a path as deleted 2009-01-28 17:29:33 -08:00
reflog-walk.c
reflog-walk.h
refs.c remote prune: warn dangling symrefs 2009-02-10 22:26:20 -08:00
refs.h remote prune: warn dangling symrefs 2009-02-10 22:26:20 -08:00
remote.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
remote.h
rerere.c rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
rerere.h rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
revision.c Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit" 2009-02-24 23:53:40 -08:00
revision.h
run-command.c Merge branch 'jk/maint-cleanup-after-exec-failure' 2009-02-03 00:26:12 -08:00
run-command.h Merge branch 'jk/maint-cleanup-after-exec-failure' 2009-02-03 00:26:12 -08:00
send-pack.h
server-info.c
setup.c Merge branch 'js/maint-1.6.0-path-normalize' 2009-02-10 21:30:52 -08:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c sha1_file.c: fix typo 2009-02-25 00:49:54 -08:00
sha1_name.c Squelch overzealous "ignoring dangling symref" in an empty repository 2009-02-11 09:22:16 -08:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
sigchain.h refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
strbuf.c strbuf: instate cleanup rule in case of non-memory errors 2009-01-06 22:13:43 -08:00
strbuf.h Add generic 'strbuf_readlink()' helper function 2008-12-17 13:36:30 -08:00
string-list.c Add find_insert_index, insert_at_index and clear_func functions to string_list 2009-02-08 12:36:31 -08:00
string-list.h Add find_insert_index, insert_at_index and clear_func functions to string_list 2009-02-08 12:36:31 -08:00
symlinks.c lstat_cache(): introduce clear_lstat_cache() function 2009-01-18 13:58:34 -08:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
test-date.c
test-delta.c
test-dump-cache-tree.c add test-dump-cache-tree in Makefile 2009-02-03 22:11:44 -08:00
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-path-utils.c Introduce the function strip_path_suffix() 2009-02-19 22:45:48 -08:00
test-sha1.c
test-sha1.sh
test-sigchain.c t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
thread-utils.c
thread-utils.h
trace.c trace: Fixed a minor typo in an error message. 2009-02-25 00:49:53 -08:00
transport.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
tree.h
unpack-file.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
unpack-trees.c Merge branch 'maint' 2009-01-31 17:42:26 -08:00
unpack-trees.h
update-server-info.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
upload-pack.c improve missing repository error message 2009-03-04 20:37:21 -08:00
usage.c
userdiff.c Change the spelling of "wordregex". 2009-01-21 23:52:16 -08:00
userdiff.h color-words: make regex configurable via attributes 2009-01-17 10:44:21 -08:00
utf8.c utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
utf8.h utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
var.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
walker.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
walker.h
wrapper.c Merge branch 'jc/maint-1.6.0-pack-directory' 2009-02-28 16:31:02 -08:00
write_or_die.c
ws.c
wt-status.c Clean up use of ANSI color sequences 2009-02-13 17:27:58 -08:00
wt-status.h
xdiff-interface.c
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/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

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.