summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2015-12-01 17:21:29 -0500
committerLibravatar Jeff King <peff@peff.net>2015-12-01 17:21:29 -0500
commit5b228f956a8f7ec5127adf9e9368220d7e5d9a5e (patch)
treef1d95645e32410c8402194a084483c4f8948c073 /userdiff.h
parentMerge branch 'sg/filter-branch-dwim-ambiguity' into maint (diff)
parentgit-p4: work with a detached head (diff)
downloadtgif-5b228f956a8f7ec5127adf9e9368220d7e5d9a5e.tar.xz
Merge branch 'ld/p4-detached-head' into maint
Make git-p4 work on a detached head. * ld/p4-detached-head: git-p4: work with a detached head git-p4: add option to system() to return subshell status git-p4: add failing test for submit from detached head
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions