summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 00:15:35 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 00:15:35 -0700
commitc80e07d4959591f5addcd48c7d42017b40c25f36 (patch)
tree7c4efc66c415a180ef62015b17607dad44cccadf /git-gui
parentgit-cvsserver: fix disabling service via per-method config (diff)
parentDocument branch.autosetupmerge. (diff)
downloadtgif-c80e07d4959591f5addcd48c7d42017b40c25f36.tar.xz
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: Document branch.autosetupmerge.
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions