Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/hash-object' | Junio C Hamano | 2015-05-11 | 5 | -9/+43 |
|\ | |||||
| * | write_sha1_file(): do not use a separate sha1[] arrayjc/hash-object | Junio C Hamano | 2015-05-05 | 1 | -4/+1 |
| * | t1007: add hash-object --literally tests | Eric Sunshine | 2015-05-05 | 1 | -0/+11 |
| * | hash-object --literally: fix buffer overrun with extra-long object type | Eric Sunshine | 2015-05-05 | 3 | -3/+23 |
| * | git-hash-object.txt: document --literally option | Eric Sunshine | 2015-05-04 | 1 | -2/+8 |
* | | Merge branch 'sb/prefix-path-free-results' | Junio C Hamano | 2015-05-11 | 2 | -13/+10 |
|\ \ | |||||
| * | | prefix_path(): unconditionally free results in the callerssb/prefix-path-free-results | Stefan Beller | 2015-05-05 | 2 | -13/+10 |
* | | | Merge branch 'sg/completion-no-redundant-all-command-list' | Junio C Hamano | 2015-05-11 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | completion: remove redundant __git_compute_all_commands() callsg/completion-no-redundant-all-command-list | SZEDER Gábor | 2015-05-03 | 1 | -1/+0 |
| |/ / | |||||
* | | | Merge branch 'sg/complete-decorate-full-not-long' | Junio C Hamano | 2015-05-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | completion: fix and update 'git log --decorate=' optionssg/complete-decorate-full-not-long | SZEDER Gábor | 2015-05-03 | 1 | -1/+1 |
* | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' | Junio C Hamano | 2015-05-11 | 2 | -1/+19 |
|\ \ \ \ | |||||
| * | | | | filter-branch: avoid passing commit message through sed | Jeff King | 2015-04-29 | 2 | -1/+19 |
* | | | | | Merge branch 'jc/daemon-no-ipv6-for-2.4.1' | Junio C Hamano | 2015-05-11 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | daemon: unbreak NO_IPV6 build regressionjc/daemon-no-ipv6-for-2.4.1 | Junio C Hamano | 2015-05-05 | 1 | -1/+1 |
* | | | | | | Merge branch 'jn/clean-use-error-not-fprintf-on-stderr' | Junio C Hamano | 2015-05-11 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: use error() instead of fprintf(stderr, ...)jn/clean-use-error-not-fprintf-on-stderr | Jonathan Nieder | 2015-05-04 | 1 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' | Junio C Hamano | 2015-05-11 | 2 | -3/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-git | Torsten Bögershausen | 2015-05-03 | 2 | -3/+16 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'va/fix-git-p4-tests' | Junio C Hamano | 2015-05-11 | 1 | -8/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: t9814: prevent --chain-lint failureva/fix-git-p4-tests | Luke Diamand | 2015-04-28 | 1 | -8/+3 |
* | | | | | | | Merge branch 'ld/p4-case-fold' | Junio C Hamano | 2015-05-11 | 2 | -1/+55 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: add failing tests for case-folding p4dld/p4-case-fold | Luke Diamand | 2015-04-28 | 2 | -1/+55 |
* | | | | | | | | Merge branch 'jk/rebase-quiet-noop' | Junio C Hamano | 2015-05-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: silence "git checkout" for noop rebasejk/rebase-quiet-noop | Jeff King | 2015-04-28 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'va/p4-client-path' | Junio C Hamano | 2015-05-11 | 2 | -4/+115 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-p4: improve client path detection when branches are usedva/p4-client-path | Vitor Antunes | 2015-04-23 | 2 | -5/+10 |
| * | | | | | | | | t9801: check git-p4's branch detection with client spec enabled | Vitor Antunes | 2015-04-22 | 1 | -0/+106 |
* | | | | | | | | | Merge branch 'mm/add-p-split-error' | Junio C Hamano | 2015-05-11 | 2 | -11/+59 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | stash -p: demonstrate failure of split with mixed y/nmm/add-p-split-error | Matthieu Moy | 2015-04-16 | 1 | -0/+23 |
| * | | | | | | | | | t3904-stash-patch: factor PERL prereq at the top of the file | Matthieu Moy | 2015-04-16 | 1 | -6/+12 |
| * | | | | | | | | | t3904-stash-patch: fix test description | Matthieu Moy | 2015-04-16 | 1 | -1/+1 |
| * | | | | | | | | | add -p: demonstrate failure when running 'edit' after a split | Matthieu Moy | 2015-04-16 | 1 | -0/+22 |
| * | | | | | | | | | t3701-add-interactive: simplify code | Matthieu Moy | 2015-04-16 | 1 | -4/+1 |
* | | | | | | | | | | Merge branch 'tb/t0027-crlf' | Junio C Hamano | 2015-05-11 | 1 | -109/+134 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t0027: Add repoMIX and LF_nul | Torsten Bögershausen | 2015-04-25 | 1 | -72/+85 |
| * | | | | | | | | | | t0027: support NATIVE_CRLF platforms | Torsten Bögershausen | 2015-04-18 | 1 | -10/+22 |
| * | | | | | | | | | | t0027: cleanup: rename functions; avoid non-leading TABs | Torsten Bögershausen | 2015-04-18 | 1 | -92/+92 |
* | | | | | | | | | | | Merge branch 'ls/p4-changes-block-size' | Junio C Hamano | 2015-05-11 | 3 | -14/+119 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-p4: use -m when running p4 changesls/p4-changes-block-size | Lex Spoon | 2015-04-20 | 3 | -14/+119 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jc/plug-fmt-merge-msg-leak' | Junio C Hamano | 2015-05-11 | 1 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fmt-merge-msg: plug small leak of commit bufferjc/plug-fmt-merge-msg-leak | Junio C Hamano | 2015-04-20 | 1 | -5/+11 |
* | | | | | | | | | | | | Merge branch 'nd/slim-index-pack-memory-usage' | Junio C Hamano | 2015-05-11 | 1 | -111/+179 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | index-pack: kill union delta_base to save memory | Nguyễn Thái Ngọc Duy | 2015-04-18 | 1 | -100/+160 |
| * | | | | | | | | | | | | index-pack: reduce object_entry size to save memory | Nguyễn Thái Ngọc Duy | 2015-02-27 | 1 | -11/+19 |
* | | | | | | | | | | | | | Merge branch 'jk/still-interesting' | Junio C Hamano | 2015-05-11 | 1 | -4/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | limit_list: avoid quadratic behavior from still_interesting | Jeff King | 2015-04-17 | 1 | -4/+19 |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jk/reading-packed-refs' | Junio C Hamano | 2015-05-11 | 8 | -6/+77 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t1430: add another refs-escape testjk/reading-packed-refs | Jeff King | 2015-04-16 | 1 | -0/+8 |
| * | | | | | | | | | | | | | read_packed_refs: avoid double-checking sane refs | Jeff King | 2015-04-16 | 1 | -2/+4 |