summaryrefslogtreecommitdiffstats
path: root/sigchain.h (unfollow)
Commit message (Expand)AuthorFilesLines
2010-01-18Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun1-1/+46
2010-01-18Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano6-18/+91
2010-01-18pull: Fix parsing of -X<option>Junio C Hamano1-7/+14
2010-01-18Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2-2/+23
2010-01-18git merge -X<option>Avery Pennarun11-26/+162
2009-11-30git-merge-file --ours, --theirsJunio C Hamano4-10/+34
2009-11-30builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun1-1/+1
2009-11-28Update draft release notes to 1.6.6 before merging topics for -rc1Junio C Hamano1-33/+100
2009-11-28Makefile: do not clean arm directoryJonathan Nieder1-1/+1
2009-11-27Add a notice that only certain functions can print color escape codesJohannes Sixt1-0/+5
2009-11-27builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2-2/+20
2009-11-27gitworkflows: Consistently back-quote git commandsBjörn Gustavsson1-1/+1
2009-11-25Explicitly truncate bswap operand to uint32_tBenjamin Kramer1-1/+1
2009-11-25t1200: fix a timing dependent errorNanako Shiraishi2-5/+9
2009-11-24Documentation: update descriptions of revision options related to '--bisect'Christian Couder1-12/+27
2009-11-24Enable support for IPv6 on MinGWMartin Storsjö3-2/+181
2009-11-24Refactor winsock initialization into a separate functionMartin Storsjö1-3/+12
2009-11-24t/gitweb-lib: Split HTTP response with non-GNU sedBrian Gernhardt1-2/+12
2009-11-24pack-objects: split implications of --all-progress from progress activationNicolas Pitre4-5/+20
2009-11-24instaweb: restart server if already runningStephen Boyd1-0/+5
2009-11-24prune-packed: only show progress when stderr is a ttyJeff King1-1/+1
2009-11-24remote-curl.c: fix rpc_out()Tay Ray Chuan1-1/+1
2009-11-24Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano8-18/+26
2009-11-24mergetool--lib: simplify guess_merge_tool()René Scharfe1-7/+6
2009-11-24strbuf_add_wrapped_text(): skip over colour codesRené Scharfe2-4/+22
2009-11-23t4014-format-patch: do not assume 'test' is available as non-builtinJohannes Sixt1-4/+2
2009-11-23Fix over-simplified documentation for 'git log -z'Björn Gustavsson1-5/+7