git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f02dd06 53b3c47)
Merge branch 'maint'
authorJunio C Hamano <redacted>
Sat, 17 Apr 2010 19:40:45 +0000 (12:40 -0700)
committerJunio C Hamano <redacted>
Sat, 17 Apr 2010 19:40:45 +0000 (12:40 -0700)
* maint:
  t1010-mktree: Adjust expected result to code and documentation
  combined diff: correctly handle truncated file
  Document new "already-merged" rule for branch -d

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

diff --cc Documentation/git-branch.txt
Simple merge
git clone https://git.99rst.org/PROJECT