]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2e86ad b5f306f)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Mar 2011 21:56:13 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Mar 2011 21:56:13 +0000 (14:56 -0700)
* maint:
  git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
  bisect: visualize with git-log if gitk is unavailable

1  2 
Documentation/git-am.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-am.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.