git/contrib, branch v1.6.4

Show the presence of untracked files in the bash prompt.

2009-07-24T16:27:18Z

Added the envvar GIT_PS1_SHOWUNTRACKEDFILES to 'git-completion.bash'. When set to a nonempty value, then the char '%' will be shown next to the branch name in the bash prompt. Signed-off-by: Daniel Trstenjak Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

bash: add '--merges' to common 'git log' options

2009-07-13T18:09:51Z

... so it's available for git log, shortlog and gitk. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

completion: __git_config_get_set_variables() handle values with spaces

2009-07-06T16:45:00Z

Commit 0065236 (bash completion: complete variable names for "git config" with options 2009-05-08) implemented its config variable search wrong. When a config contains a value with a space and a period (.) in it, completion erroneously thinks that line in the configuration is multiple config variables. For example $ cat .git/config format.cc = Junio C Hamano $ git config --unset format.cc Instead of using a for loop splitting across spaces, pipe each line to a while read loop and beef up the case statement to match only 'config.variable=value'. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

completion: Add --full-diff to log options

2009-07-06T16:36:24Z

Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

completion: add missing config variables

2009-06-30T18:20:04Z

Update to include branch.*.rebase, remote.*.pushurl, and add.ignore-errors Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Merge branch 'pb/send-email-cccmd-fix'

2009-06-21T04:47:06Z

* pb/send-email-cccmd-fix: Test cccmd in t9001-send-email.sh and fix some bugs

Merge branch 'maint'

2009-06-18T17:39:17Z

* maint: http.c: fix compiling with libcurl 7.9.2 import-tars: support symlinks pull, rebase: simplify to use die()

Test cccmd in t9001-send-email.sh and fix some bugs

2009-06-18T16:55:59Z

For another patch series I'm working on I needed some tests for the cc-cmd feature of git-send-email. This patch adds 3 tests for the feature and for the possibility to specify --suppress-cc multiple times, and fixes two bugs. The first bug is that the --suppress-cc option for `cccmd' was misspelled as `ccmd' in the code. The second bug, which is actually found only with my other series, is that the argument to the cccmd is never quoted, so the cccmd would fail with patch file names containing a space. A third bug I fix (in the docs) is that the bodycc argument was actually spelled ccbody in the documentation and bash completion. Signed-off-by: Paolo Bonzini Cc: Markus Heidelberg Signed-off-by: Junio C Hamano

import-tars: support symlinks

2009-06-18T16:53:53Z

Without this patch, symbolic links are turned into empty files. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'da/araxis-mergetool'

2009-06-13T19:47:08Z

* da/araxis-mergetool: mergetool--lib: add support for araxis merge