summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-05-01 15:24:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-01 15:24:01 -0700
commitc259a1a927016fa5b80e3a7055031430cbdfddb8 (patch)
tree841a389391b80df690c30fb64792a068c49940fc /mergetools/p4merge
parentMerge branch 'zk/prompt-rebase-step' (diff)
parentremote: 'show' and 'prune' can take more than one remote (diff)
downloadtgif-c259a1a927016fa5b80e3a7055031430cbdfddb8.tar.xz
Merge branch 'tr/remote-tighten-commandline-parsing'
* tr/remote-tighten-commandline-parsing: remote: 'show' and 'prune' can take more than one remote remote: check for superfluous arguments in 'git remote add' remote: add a test for extra arguments, according to docs
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions