Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Shawn O. Pearce
<spearce@spearce.org>
Wed, 10 Oct 2007 05:09:41 +0000
(
01:09
-0400)
committer
Shawn O. Pearce
<spearce@spearce.org>
Wed, 10 Oct 2007 05:09:41 +0000
(
01:09
-0400)
* maint:
git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
1
2
git-gui.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
1952aa1
96f1195
)
diff --cc
git-gui.sh
Simple merge