| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'lt/maint-wrap-zlib' | Junio C Hamano | 2009-01-21 | 1 | -2/+3 |
|\ |
|
| * | Wrap inflate and other zlib routines for better error reporting | Linus Torvalds | 2009-01-11 | 1 | -2/+3 |
* | | Merge branch 'mv/apply-parse-opt' | Junio C Hamano | 2009-01-17 | 1 | -126/+140 |
|\ \ |
|
| * | | Resurrect "git apply --flags -" to read from the standard input | Junio C Hamano | 2009-01-09 | 1 | -14/+5 |
| * | | parse-opt: migrate builtin-apply. | Miklos Vajna | 2008-12-30 | 1 | -129/+152 |
* | | | Merge branch 'ap/maint-apply-modefix' | Junio C Hamano | 2009-01-03 | 1 | -1/+3 |
|\ \ \
| |/ /
|/| | |
|
| * | | builtin-apply: prevent non-explicit permission changes | Junio C Hamano | 2009-01-02 | 1 | -1/+3 |
* | | | Add generic 'strbuf_readlink()' helper function | Linus Torvalds | 2008-12-17 | 1 | -4/+2 |
* | | | Merge branch 'ar/maint-mksnpath' into HEAD | Junio C Hamano | 2008-10-26 | 1 | -2/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix potentially dangerous uses of mkpath and git_path | Alex Riesen | 2008-10-26 | 1 | -2/+2 |
* | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-12 | 1 | -0/+7 |
|\ \ \
| |/ / |
|
| * | | git apply --directory broken for new files | Jeff King | 2008-10-12 | 1 | -0/+7 |
* | | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -18/+8 |
* | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-09 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | builtin-apply: fix typo leading to stack corruption | Imre Deak | 2008-10-09 | 1 | -1/+1 |
| * | | do not segfault if make_cache_entry failed | Dmitry Potapov | 2008-10-06 | 1 | -0/+2 |
* | | | do not segfault if make_cache_entry failed | Dmitry Potapov | 2008-10-06 | 1 | -0/+2 |
* | | | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 | 1 | -9/+2 |
|\ \ \
| |/ / |
|
| * | | Use remove_path from dir.c instead of own implementation | Alex Riesen | 2008-09-29 | 1 | -9/+2 |
* | | | git-apply:--include=pathspec | Junio C Hamano | 2008-09-06 | 1 | -15/+33 |
|/ / |
|
* | | Merge branch 'ho/dashless' into maint | Junio C Hamano | 2008-09-03 | 1 | -4/+4 |
|\ \ |
|
| * | | 'git foo' program identifies itself without dash in die() messages | Junio C Hamano | 2008-08-31 | 1 | -3/+3 |
| * | | Start conforming code to "git subcmd" style | Heikki Orsila | 2008-08-30 | 1 | -1/+1 |
* | | | git-apply: Loosen "match_beginning" logic | Junio C Hamano | 2008-08-30 | 1 | -1/+4 |
|/ / |
|
* | | Rename path_list to string_list | Johannes Schindelin | 2008-07-21 | 1 | -8/+8 |
* | | Make usage strings dash-less | Stephan Beyer | 2008-07-13 | 1 | -1/+1 |
* | | apply: fix copy/rename breakage | Junio C Hamano | 2008-07-09 | 1 | -3/+7 |
* | | Merge branch 'js/apply-root' | Junio C Hamano | 2008-07-09 | 1 | -0/+24 |
|\ \ |
|
| * | | git-apply --directory: make --root more similar to GNU diff | Junio C Hamano | 2008-07-06 | 1 | -2/+2 |
| * | | apply --root: thinkofix. | Junio C Hamano | 2008-07-02 | 1 | -2/+2 |
| * | | Teach "git apply" to prepend a prefix with "--root=<root>" | Johannes Schindelin | 2008-07-01 | 1 | -0/+24 |
| |/ |
|
* | | Fix apply --recount handling of no-EOL line | Thomas Rast | 2008-07-05 | 1 | -1/+1 |
* | | Merge branch 'js/apply-recount' | Junio C Hamano | 2008-07-01 | 1 | -7/+68 |
|\ \ |
|
| * | | Allow git-apply to recount the lines in a hunk (AKA recountdiff) | Johannes Schindelin | 2008-06-28 | 1 | -7/+68 |
| |/ |
|
* | | Merge branch 'jc/checkdiff' | Junio C Hamano | 2008-07-01 | 1 | -3/+2 |
|\ \ |
|
| * | | check_and_emit_line(): rename and refactor | Junio C Hamano | 2008-06-26 | 1 | -3/+2 |
| |/ |
|
* | | git-apply: handle a patch that touches the same path more than once better | Don Zickus | 2008-06-27 | 1 | -10/+72 |
|/ |
|
* | Merge branch 'js/config-cb'v1.5.6-rc0 | Junio C Hamano | 2008-05-25 | 1 | -3/+3 |
|\ |
|
| * | Provide git_config with a callback-data parameter | Johannes Schindelin | 2008-05-14 | 1 | -3/+3 |
* | | builtin-apply: do not declare patch is creation when we do not know it | Junio C Hamano | 2008-05-17 | 1 | -15/+0 |
* | | builtin-apply: accept patch to an empty file | Junio C Hamano | 2008-05-17 | 1 | -56/+77 |
* | | builtin-apply: typofix | Junio C Hamano | 2008-05-17 | 1 | -1/+1 |
|/ |
|
* | Optimize symlink/directory detection | Linus Torvalds | 2008-05-10 | 1 | -1/+1 |
* | Merge branch 'maint' | Junio C Hamano | 2008-04-16 | 1 | -1/+1 |
|\ |
|
| * | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-16 | 1 | -1/+1 |
| |\ |
|
| | * | builtin-apply: Show a more descriptive error on failure when opening a patch | Alberto Bertogli | 2008-04-15 | 1 | -1/+1 |
* | | | builtin-apply.c: use git_config_string() to get apply_default_whitespace | Stephan Beyer | 2008-04-14 | 1 | -6/+2 |
|/ / |
|
* | | Merge branch 'jc/maint-apply-match-beginning' | Junio C Hamano | 2008-04-06 | 1 | -13/+16 |
|\ \
| |/ |
|
| * | Fix "git apply" to correctly enforce "match at the beginning" | Junio C Hamano | 2008-04-06 | 1 | -13/+16 |
* | | Always set *nongit_ok in setup_git_directory_gently() | SZEDER Gábor | 2008-03-26 | 1 | -1/+1 |