merge: seed the commit message with list of conflicted files.
[gitweb.git] / apply.c
2006-01-06 Merge fixes up to GIT 1.0.7
2006-01-06 GIT 1.0.7 v1.0.7
2006-01-06 fix potential deadlock in create_one_file
2006-01-06 trivial: O_EXCL makes O_TRUNC redundant
2005-12-21 GIT 1.0.0 v1.0.0
2005-12-20 xread/xwrite: do not worry about EINTR at calling sites.
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4
2005-11-30 Merge branch 'jc/subdir'
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 git-apply: work from subdirectory.
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-18 Merge branch 'master'
2005-11-18 Deal with binary diff output from GNU diff 2.8.7
2005-11-17 GIT 0.99.9j aka 1.0rc3 v0.99.9jv1.0rc3
2005-11-17 apply: allow-binary-replacement.
2005-11-16 git-apply: fail if a patch cannot be applied.
2005-11-15 GIT 0.99.9i aka 1.0rc2 v0.99.9iv1.0rc2
2005-11-15 apply: fix binary patch detection.
2005-11-12 GIT 0.99.9h v0.99.9hv1.0rc1
2005-11-12 Documentation: git-apply --no-add
2005-11-12 merge-one-file: use common as base, instead of emptiness.
2005-11-10 GIT 0.99.9g v0.99.9g
2005-11-10 Merge branch 'hold/svn'
2005-11-10 Merge branch 'hold/rpm'
2005-11-09 git-apply: do not fail on binary diff when not applying...
2005-11-07 GIT 0.99.9e v0.99.9e
2005-10-31 GIT 0.99.9a v0.99.9a
2005-10-29 git-apply --numstat
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23 Merge branch 'fixes'
2005-10-23 Merge branch 'fixes'
2005-10-21 Merge branch 'fixes'
2005-10-21 Merge branch 'fixes'
2005-10-18 git-apply: remove unused --show-files flag.
2005-10-18 Update git-apply to use C-style quoting for funny pathn...
2005-10-18 Merge branch 'fixes'
2005-10-18 Merge branch 'fixes'
2005-10-16 Merge branch 'fixes'
2005-10-16 Merge branch 'fixes'
2005-10-16 Merge branch 'svn' of netz.smurf.noris.de/git/git
2005-10-16 Update git-apply to use C-style quoting for funny pathn...
2005-10-15 Merge branch 'fixes'
2005-10-15 Unlocalized isspace and friends
2005-10-12 Merge branch 'fixes'
2005-10-10 Merge branch 'fixes'
2005-10-10 Merge branch 'fixes'
2005-10-08 Merge branch 'fixes'
2005-10-07 git-apply: parse index information
2005-10-05 Merge branch 'fixes'
2005-10-05 git-apply: retire unused/unimplemented --no-merge flag.
2005-10-05 git-apply: allow operating in sparsely populated workin...
2005-10-03 Merge with master.kernel.org:/pub/scm/git/git.git
2005-10-01 [PATCH] Flag empty patches as errors
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-04 Merge branch 'master' of .
2005-09-04 [PATCH] Make git-apply understand incomplete lines...
2005-08-30 Merge refs/heads/master from paulus
2005-08-29 Merge refs/heads/master from .
2005-08-29 Merge refs/heads/portable from cs.berkeley.edu/~ejr...
2005-08-29 Merge refs/heads/master from .
2005-08-28 [PATCH] Fix git patch header processing in git-apply.
2005-08-24 Fix ?: statements.
2005-08-19 Merge from gitk
2005-08-18 Merge with gitk --parents change.
2005-08-18 Merge with gitk
2005-08-17 Merge changes from master.
2005-08-17 [PATCH] When copying or renaming, keep the mode, please
2005-08-12 Merge with gitk.
2005-08-10 Merge with gitk.
2005-08-10 Merge with master.
2005-08-10 [PATCH] -Werror fixes
2005-08-09 Merge with gitk.
2005-08-08 Merge with gitk.
2005-08-07 Merge with gitk.
2005-08-06 Merge with gitk.
2005-08-05 Merge with gitk.
2005-07-31 Merge with gitk.
2005-07-29 Merge with gitk.
2005-07-29 [PATCH] Make git-apply --stat less butt-ugly with long...
2005-07-22 [PATCH] apply.c: --exclude=fnmatch-pattern option.
2005-07-22 [PATCH] apply.c: handle incomplete lines correctly.
2005-07-18 Merge master.kernel.org:/pub/scm/gitk/gitk
2005-07-16 Merge git-tools repository under "tools" subdirectory
2005-07-14 [PATCH] apply: match documentation, usage string and...
2005-07-14 git-apply: be a lot more careful when writing files
2005-07-12 [PATCH] git: fix trivial warning from show_rename_copy()
2005-07-06 [PATCH] Let umask do its work upon filesystem object...
2005-07-06 Merge master.kernel.org:/pub/scm/gitk/gitk
2005-07-05 Merge with Linus' current tree
2005-07-03 Fix sparse warnings.
2005-06-28 Merge rsync://rsync.kernel.org/pub/scm/gitk/gitk
2005-06-23 git-apply: take "--apply" flag to force an apply even...
2005-06-22 Do a cross-project merge of Paul Mackerras' gitk visualizer
2005-06-22 [PATCH] git-apply: implement --summary option.
2005-06-22 [PATCH] git-apply --stat: show new filename for rename...
next