Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' | Junio C Hamano | 2017-11-27 | 1 | -0/+2 |
|\ | |||||
| * | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-line | René Scharfe | 2017-11-17 | 1 | -0/+2 |
* | | Merge branch 'rs/apply-fuzzy-match-fix' | Junio C Hamano | 2017-11-21 | 1 | -39/+20 |
|\ \ | |||||
| * | | apply: avoid out-of-bounds access in fuzzy_matchlines()rs/apply-fuzzy-match-fix | René Scharfe | 2017-11-12 | 1 | -39/+20 |
* | | | apply: remove `newfd` from `struct apply_state` | Martin Ågren | 2017-10-06 | 1 | -11/+6 |
* | | | apply: move lockfile into `apply_state` | Martin Ågren | 2017-10-06 | 1 | -9/+5 |
* | | | consistently use "fallthrough" comments in switchesjk/fallthrough | Jeff King | 2017-09-22 | 1 | -1/+2 |
* | | | Merge branch 'rs/apply-epoch' | Junio C Hamano | 2017-09-10 | 1 | -19/+18 |
|\ \ \ | |||||
| * | | | apply: remove epoch date from regexrs/apply-epoch | René Scharfe | 2017-08-25 | 1 | -7/+5 |
| * | | | apply: check date of potential epoch timestamps first | René Scharfe | 2017-08-25 | 1 | -16/+17 |
* | | | | Merge branch 'tb/apply-with-crlf' | Junio C Hamano | 2017-08-26 | 1 | -5/+36 |
|\ \ \ \ | |||||
| * | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlf | Torsten Bögershausen | 2017-08-19 | 1 | -5/+36 |
* | | | | | Merge branch 'rs/apply-lose-prefix-length' | Junio C Hamano | 2017-08-22 | 1 | -7/+5 |
|\ \ \ \ \ | |||||
| * | | | | | apply: remove prefix_length member from apply_staters/apply-lose-prefix-length | René Scharfe | 2017-08-09 | 1 | -7/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rs/move-array' | Junio C Hamano | 2017-08-11 | 1 | -7/+4 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image() | René Scharfe | 2017-07-17 | 1 | -7/+4 |
| | |/ / | |/| | | |||||
* | | | | sha1_name: convert get_sha1* to get_oid* | brian m. carlson | 2017-07-17 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'rs/apply-avoid-over-reading' | Junio C Hamano | 2017-07-12 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-reading | René Scharfe | 2017-07-09 | 1 | -2/+1 |
* | | | | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | wildmatch: remove unused wildopts parameterab/wildmatch | Ævar Arnfjörð Bjarmason | 2017-06-23 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/apply-avoid-over-reading' | Junio C Hamano | 2017-07-06 | 1 | -2/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | apply: use starts_with() in gitdiff_verify_name() | René Scharfe | 2017-07-01 | 1 | -2/+1 |
* | | | | | Merge branch 'rs/apply-validate-input' | Junio C Hamano | 2017-06-30 | 1 | -6/+29 |
|\ \ \ \ \ | |||||
| * | | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-input | René Scharfe | 2017-06-27 | 1 | -0/+15 |
| * | | | | | apply: check git diffs for invalid file modes | René Scharfe | 2017-06-27 | 1 | -5/+12 |
| * | | | | | apply: check git diffs for missing old filenames | René Scharfe | 2017-06-27 | 1 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -2/+1 |
* | | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
* | | | | | | | Merge branch 'bw/ls-files-sans-the-index' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | convert: convert convert_to_git to take an index | Brandon Williams | 2017-06-13 | 1 | -1/+1 |
* | | | | | | | Merge branch 'pc/dir-count-slashes' | Junio C Hamano | 2017-06-22 | 1 | -11/+0 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | dir: create function count_slashes()pc/dir-count-slashes | Prathamesh Chavan | 2017-06-12 | 1 | -11/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/noent-notdir' | Junio C Hamano | 2017-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedjc/noent-notdir | Junio C Hamano | 2017-05-30 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jc/apply-fix-mismerge' | Junio C Hamano | 2017-05-16 | 1 | -169/+169 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | apply.c: fix whitespace-only mismergejc/apply-fix-mismerge | Junio C Hamano | 2017-05-08 | 1 | -169/+169 |
| |/ / / | |||||
* | | | | prefix_filename: return newly allocated string | Jeff King | 2017-03-21 | 1 | -3/+6 |
* | | | | prefix_filename: drop length parameter | Jeff King | 2017-03-21 | 1 | -4/+2 |
|/ / / | |||||
* | | | apply: use SWAP macro | René Scharfe | 2017-01-30 | 1 | -16/+7 |
* | | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | 1 | -1/+1 |
|/ / | |||||
* | | i18n: apply: mark error message for translation | Vasco Almeida | 2016-10-17 | 1 | -2/+2 |
* | | i18n: apply: mark error messages for translation | Vasco Almeida | 2016-10-14 | 1 | -24/+24 |
* | | i18n: apply: mark info messages for translation | Vasco Almeida | 2016-10-14 | 1 | -4/+4 |
* | | i18n: apply: mark plural string for translation | Vasco Almeida | 2016-10-14 | 1 | -4/+6 |
* | | introduce CHECKOUT_INITrs/checkout-init-macro | René Scharfe | 2016-09-22 | 1 | -3/+1 |
* | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 | 1 | -215/+215 |
|\ \ | |||||
* | | | apply: learn to use a different index file | Christian Couder | 2016-09-07 | 1 | -6/+21 |