diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 08:56:07 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 08:56:07 -0700 |
| commit | 276328ffb87cefdc515bee5f09916aea6e0244ed (patch) | |
| tree | 162b276adac033e8a41266071e046f0f4cf4cd6d /t/t5515-fetch-merge-logic.sh | |
| parent | do not segfault if make_cache_entry failed (diff) | |
| parent | Update release notes for 1.6.0.3 (diff) | |
| download | tgif-276328ffb87cefdc515bee5f09916aea6e0244ed.tar.xz | |
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 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions