summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-06 08:56:07 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-06 08:56:07 -0700
commit276328ffb87cefdc515bee5f09916aea6e0244ed (patch)
tree162b276adac033e8a41266071e046f0f4cf4cd6d /builtin-merge.c
parent048f2762007d022defceb6850a44bc1bd5ccebf7 (diff)
parente261cf94848d31868c21fb11cade51c30dfcdbe7 (diff)
downloadgit-276328ffb87cefdc515bee5f09916aea6e0244ed.tar.gz
Merge branch 'maint'
* maint: Update release notes for 1.6.0.3 Teach rebase -i to honor pre-rebase hook docs: describe pre-rebase hook do not segfault if make_cache_entry failed make prefix_path() never return NULL fix bogus "diff --git" header from "diff --no-index" Fix fetch/clone --quiet when stdout is connected builtin-blame: Fix blame -C -C with submodules. bash: remove fetch, push, pull dashed form leftovers Conflicts: diff.c
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions