summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-12 23:14:07 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-12 23:14:07 -0700
commit27ebd6e0443bdd795869f598ecebc9eadd64a26c (patch)
tree743be51f078dd661f156ee66b3536c910d913dc9 /git-merge-octopus.sh
parentMerge branch 'maint' (diff)
parentMerge branch 'maint' (diff)
downloadtgif-27ebd6e0443bdd795869f598ecebc9eadd64a26c.tar.xz
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Support of "make -s" in: do not output anything of the build itself
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions