summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-02 16:22:11 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-02 16:22:11 -0700
commit6a40327d242dac9f85c6d63c94d537b45ba86e89 (patch)
tree28172f8dafa4ddac3ee43a1884f31f2b26cc7afe /gitk
parentMerge branch 'jc/grep' into next (diff)
parentMerge branch 'fix' (diff)
downloadtgif-6a40327d242dac9f85c6d63c94d537b45ba86e89.tar.xz
Merge branch 'master' into next
* master: git-send-email: fix version string to be valid perl Give the user a hint for how to continue in the case that git-am fails because it requires user intervention repo-config: trim white-space before comment repo-config: fix segfault with no argument.
Diffstat (limited to 'gitk')
0 files changed, 0 insertions, 0 deletions