diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-22 14:56:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-22 14:56:13 -0700 |
| commit | 1ea9f9d6c28caf886747ca256e9d39d24f03d229 (patch) | |
| tree | f3b25e33337c23054f8e979ee16a91f1d1bbffee | |
| parent | c2e86addb86689306b992065328ec52aa2479658 (diff) | |
| parent | b5f306fbe1bf1a75341f85b84358d25870b010f3 (diff) | |
| download | git-1ea9f9d6c28caf886747ca256e9d39d24f03d229.tar.gz git-1ea9f9d6c28caf886747ca256e9d39d24f03d229.tar.xz | |
Merge branch 'maint'
* maint:
git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
bisect: visualize with git-log if gitk is unavailable
| -rw-r--r-- | Documentation/git-am.txt | 6 | ||||
| -rwxr-xr-x | git-bisect.sh | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 621b72009..6b1b5af64 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -173,9 +173,9 @@ aborts in the middle. You can recover from this in one of two ways: the index file to bring it into a state that the patch should have produced. Then run the command with the '--resolved' option. -The command refuses to process new mailboxes while the `.git/rebase-apply` -directory exists, so if you decide to start over from scratch, -run `rm -f -r .git/rebase-apply` before running the command with mailbox +The command refuses to process new mailboxes until the current +operation is finished, so if you decide to start over from scratch, +run `git am --abort` before running the command with mailbox names. Before any patches are applied, ORIG_HEAD is set to the tip of the diff --git a/git-bisect.sh b/git-bisect.sh index c21e33c8d..415a8d04c 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -288,10 +288,12 @@ bisect_visualize() { if test $# = 0 then - case "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" in - '') set git log ;; - set*) set gitk ;; - esac + if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" && + type gitk >/dev/null 2>&1; then + set gitk + else + set git log + fi else case "$1" in git*|tig) ;; |