aboutsummaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-26 23:05:42 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-26 23:05:42 -0800
commit5419127d0475a78983696544ca5e672e8ea4075d (patch)
tree70d9782312c8392f1ccf704e33248955c496b04f /builtin/push.c
parent31e3d834b39b773831c3c3e2637f2d99bfad9cbf (diff)
parent690b29758289ac81062159c178b6d917f06e9862 (diff)
downloadgit-5419127d0475a78983696544ca5e672e8ea4075d.tar.gz
git-5419127d0475a78983696544ca5e672e8ea4075d.tar.xz
Merge branch 'jc/doc-merge-options'
* jc/doc-merge-options: Documentation/merge-options.txt: group "ff" related options together
Diffstat (limited to 'builtin/push.c')
0 files changed, 0 insertions, 0 deletions