git/contrib, branch v1.7.2

Add a sample user for the svndump library

2010-07-16T20:21:47Z

The svn-fe tool takes a Subversion dump file as input and produces a fast-import stream as output. This can be useful as a low-level tool in building other importers, or for debugging the vcs-svn library. make svn-fe make svn-fe.1 to test. Signed-off-by: Jonathan Nieder Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

Merge branch 'tr/rev-list-count'

2010-06-30T18:55:38Z

* tr/rev-list-count: bash completion: Support "divergence from upstream" messages in __git_ps1 rev-list: introduce --count option Conflicts: contrib/completion/git-completion.bash

Merge branch 'as/maint-completion-set-u-fix'

2010-06-30T18:55:37Z

* as/maint-completion-set-u-fix: bash-completion: Fix __git_ps1 to work with "set -u"

bash completion: Support "divergence from upstream" messages in __git_ps1

2010-06-24T17:02:45Z

Add a notification in the command prompt specifying whether (and optionally how far) your branch has diverged from its upstream. This is especially helpful in small teams that very frequently (forget to) push to each other. Support git-svn upstream detection as a special case, as migrators from centralised version control systems are especially likely to forget to push. Support for other types of upstream than SVN should be easy to add if anyone is so inclined. Signed-off-by: Andrew Sayers Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Merge branch 'sb/format-patch-signature'

2010-06-22T16:45:22Z

* sb/format-patch-signature: completion: Add --signature and format.signature format-patch: Add a signature option (--signature)

Merge branch 'em/checkout-orphan'

2010-06-21T13:02:41Z

* em/checkout-orphan: log_ref_setup: don't return stack-allocated array bash completion: add --orphan to 'git checkout' t3200: test -l with core.logAllRefUpdates options checkout --orphan: respect -l option always refs: split log_ref_write logic into log_ref_setup Documentation: alter checkout --orphan description

bash-completion: Fix __git_ps1 to work with "set -u"

2010-06-18T16:15:52Z

Define several variables in __git_ps1 to avoid errors under "set -u" semantics. __git_ps1 seems to have been missed when the rest of the file was fixed in 25a31f8. Signed-off-by: Andrew Sayers Signed-off-by: Junio C Hamano

completion: Add --signature and format.signature

2010-06-16T17:11:19Z

Cc: Shawn O. Pearce Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

bash completion: add --orphan to 'git checkout'

2010-06-03T21:46:19Z

Update git-completion.bash with new --orphan option to 'git checkout'. Signed-off-by: Erick Mattos Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-05-28T23:59:42Z

* maint: Makefile: reenable install with NO_CURL completion: --set-upstream option for git-branch get_cwd_relative(): do not misinterpret suffix as subdirectory