projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1eb96a2 47282d4)
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 6 Jul 2007 08:03:24 +0000 (04:03 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 6 Jul 2007 08:03:24 +0000 (04:03 -0400)
commitf8186e92e3399ddd742f2397e802467cabf2849f
tree161205087594eacf3de71afcc1a003077375c09etree | snapshot
parent1eb96a25c9e76b70ca3f335bce7e60d66220eaa9commit | diff
parent47282d4646372aa859908c3b9471b96c385abe5fcommit | diff
Merge branch 'maint'

* maint:
  git-gui: Ensure windows shortcuts always have .bat extension
  git-gui: Include a Push action on the left toolbar
  git-gui: Bind M1-P to push action
  git-gui: Don't bind F5/M1-R in all windows

Conflicts:

git-gui.sh
git-gui.sh diff1 | diff2 | blob | history
Git—the stupid content tracker