git/contrib, branch v2.1.2

Merge branch 'jk/prompt-stash-could-be-packed' into maint

2014-09-19T21:05:11Z

* jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR

git-prompt: do not look for refs/stash in $GIT_DIR

2014-08-25T19:21:17Z

Since dd0b72c (bash prompt: use bash builtins to check stash state, 2011-04-01), git-prompt checks whether we have a stash by looking for $GIT_DIR/refs/stash. Generally external programs should never do this, because they would miss packed-refs. That commit claims that packed-refs does not pack refs/stash, but that is not quite true. It does pack the ref, but due to a bug, fails to prune the ref. When we fix that bug, we would want to be doing the right thing here. Signed-off-by: Jeff King Reviewed-by: Michael Haggerty Reviewed-by: Ronnie Sahlberg Signed-off-by: Junio C Hamano

various contrib: Fix links in man pages

2014-08-07T16:43:21Z

Inspired by 2147fa7e (2014-07-31 git-push: fix link in man page), I grepped through the whole tree searching for 'gitlink:' occurrences. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'jk/more-push-completion'

2014-07-30T21:21:14Z

* jk/more-push-completion: completion: complete `git push --force-with-lease=` completion: add some missing options to `git push` completion: complete "unstuck" `git push --recurse-submodules`

Merge branch 'cc/replace-graft'

2014-07-27T22:14:18Z

"git replace" learned a "--graft" option to rewrite parents of a commit. * cc/replace-graft: replace: add test for --graft with a mergetag replace: check mergetags when using --graft replace: add test for --graft with signed commit replace: remove signature when using --graft contrib: add convert-grafts-to-replace-refs.sh Documentation: replace: add --graft option replace: add test for --graft replace: add --graft option replace: cleanup redirection style in tests

completion: complete `git push --force-with-lease=`

2014-07-22T20:30:30Z

Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: add some missing options to `git push`

2014-07-22T20:23:39Z

Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: complete "unstuck" `git push --recurse-submodules`

2014-07-22T20:21:07Z

Since the argument to `--recurse-submodules` is mandatory, it does not need to be stuck to the option with `=`. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'ep/shell-assign-and-export-vars' into maint

2014-07-22T17:22:57Z

* ep/shell-assign-and-export-vars: scripts: more "export VAR=VALUE" fixes scripts: "export VAR=VALUE" construct is not portable

contrib: add convert-grafts-to-replace-refs.sh

2014-07-21T19:05:53Z

This patch adds into contrib/ an example script to convert grafts from an existing grafts file into replace refs using the new --graft option of "git replace". While at it let's mention this new script in the "git replace" documentation for the --graft option. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano