summaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/spht'Junio C Hamano2007-12-091-83/+155
|\
| * Use gitattributes to define per-path whitespace ruleJunio C Hamano2007-12-061-14/+22
| * core.whitespace: documentation updates.Junio C Hamano2007-11-241-1/+1
| * builtin-apply: teach whitespace_rulesJunio C Hamano2007-11-241-19/+49
| * builtin-apply: rename "whitespace" variables and fix stylesJunio C Hamano2007-11-231-57/+91
* | Remove unreachable statementsGuido Ostkamp2007-11-151-1/+0
* | Merge branch 'jc/maint-add-sync-stat'Junio C Hamano2007-11-141-1/+1
|\ \ | |/ |/|
| * ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano2007-11-101-1/+1
| * apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-261-13/+22
* | Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsRené Scharfe2007-10-221-1/+1
* | builtin-apply: fix conversion error in strbuf seriesJunio C Hamano2007-10-031-1/+1
* | Merge branch 'ph/strbuf'Junio C Hamano2007-10-031-302/+183
|\ \
| * | Make read_patch_file work on a strbuf.Pierre Habouzit2007-09-291-16/+11
| * | strbuf_read_file enhancement, and use it.Pierre Habouzit2007-09-291-10/+2
| * | strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit2007-09-291-9/+7
| * | Full rework of quote_c_style and write_name_quoted.Pierre Habouzit2007-09-201-47/+30
| * | Rework unquote_c_style to work on a strbuf.Pierre Habouzit2007-09-201-61/+62
| * | builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.Junio C Hamano2007-09-191-0/+1
| * | Use xmemdupz() in many places.Pierre Habouzit2007-09-181-9/+2
| * | Merge branch 'master' into ph/strbufJunio C Hamano2007-09-181-8/+35
| |\ \
| * | | builtin-apply: use strbuf's instead of buffer_desc's.Pierre Habouzit2007-09-161-140/+72
| * | | Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-161-1/+0
| * | | Rewrite convert_to_{git,working_tree} to use strbuf's.Pierre Habouzit2007-09-161-14/+13
| * | | Strbuf API extensions and fixes.Pierre Habouzit2007-09-101-2/+2
| * | | Use strbuf API in apply, blame, commit-tree and diffPierre Habouzit2007-09-061-21/+9
* | | | apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-181-13/+22
| |/ / |/| |
* | | Merge branch 'maint'Junio C Hamano2007-09-181-1/+1
|\ \ \ | | |/ | |/|
| * | Fix lapsus in builtin-apply.cPierre Habouzit2007-09-181-1/+1
* | | Merge branch 'cr/reset'Junio C Hamano2007-09-181-2/+0
|\ \ \ | |/ / |/| |
| * | Simplify cache APIJunio C Hamano2007-09-141-2/+0
| |/
* | git-apply: fix whitespace strippingJ. Bruce Fields2007-09-171-3/+10
* | apply --index-info: fall back to current index for mode changesJohannes Schindelin2007-09-161-2/+24
|/
* git-apply: do not read past the end of bufferJunio C Hamano2007-09-051-1/+2
* git-apply: apply submodule changesSven Verdoolaege2007-08-151-25/+86
* Merge branch 'maint'Junio C Hamano2007-08-061-1/+1
|\
| * apply: remove directory that becomes empty by renaming the last file awayLinus Torvalds2007-08-061-1/+1
* | Merge branch 'maint'Junio C Hamano2007-07-071-1/+5
|\ \ | |/
| * Fix "apply --reverse" with regard to whitespaceJohannes Schindelin2007-07-071-1/+5
* | git-apply: what is detected and fixed is not just trailing spaces.Junio C Hamano2007-06-021-9/+8
* | git-apply: Fix removal of new trailing blank lines.Junio C Hamano2007-05-201-33/+15
* | Teach 'git-apply --whitespace=strip' to remove empty lines at the end of fileMarco Costalba2007-05-201-3/+40
|/
* Ensure return value from xread() is always stored into an ssize_tJohan Herland2007-05-151-2/+2
* apply: do not get confused by symlinks in the middleJunio C Hamano2007-05-111-9/+26
* Merge branch 'jc/attr'Junio C Hamano2007-04-211-11/+7
|\
| * Simplify calling of CR/LF conversion routinesAlex Riesen2007-04-201-11/+7
* | Merge branch 'maint'Junio C Hamano2007-04-181-2/+1
|\ \ | |/ |/|
| * Fix overwriting of files when applying contextually independent diffsAlex Riesen2007-04-181-2/+1
* | Merge branch 'jc/index-output'Junio C Hamano2007-04-071-3/+3
|\ \
| * | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-031-3/+3
* | | Merge branch 'maint'Junio C Hamano2007-04-051-2/+2
|\ \ \ | | |/ | |/|
View Lorry Controller Status