mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
  bisect: visualize with git-log if gitk is unavailable
This commit is contained in:
Junio C Hamano 2011-03-22 14:56:13 -07:00
commit 1ea9f9d6c2
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-am.txt
View File

@ -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 the index file to bring it into a state that the patch should
have produced. Then run the command with the '--resolved' option. have produced. Then run the command with the '--resolved' option.
The command refuses to process new mailboxes while the `.git/rebase-apply` The command refuses to process new mailboxes until the current
directory exists, so if you decide to start over from scratch, operation is finished, so if you decide to start over from scratch,
run `rm -f -r .git/rebase-apply` before running the command with mailbox run `git am --abort` before running the command with mailbox
names. names.
Before any patches are applied, ORIG_HEAD is set to the tip of the Before any patches are applied, ORIG_HEAD is set to the tip of the

10
git-bisect.sh
View File

@ -288,10 +288,12 @@ bisect_visualize() {
if test $# = 0 if test $# = 0
then then
case "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" in if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
'') set git log ;; type gitk >/dev/null 2>&1; then
set*) set gitk ;; set gitk
esac else
set git log
fi
else else
case "$1" in case "$1" in
git*|tig) ;; git*|tig) ;;