summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jon Loeliger <jdl@freescale.com>2008-04-23 16:14:30 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-29 23:11:57 -0700
commit4fe86488e1a550aa058c081c7e67644dd0f7c98e (patch)
tree335b7e388351fcccec135593bb44d451d75f65fc /git-merge.sh
parentgit-svn: detect and fail gracefully when dcommitting to a void (diff)
downloadtgif-4fe86488e1a550aa058c081c7e67644dd0f7c98e.tar.xz
Add otherwise missing --strict option to unpack-objects summary.
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions