Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | 1 | -0/+10 |
|\ | |||||
| * | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-26 | 1 | -0/+10 |
* | | Sync with 2.4.3 | Junio C Hamano | 2015-06-05 | 2 | -1/+78 |
|\ \ | |||||
| * | | Git 2.4.3v2.4.3 | Junio C Hamano | 2015-06-05 | 2 | -1/+78 |
| * | | Merge branch 'ps/doc-packfile-vs-pack-file' into maint | Junio C Hamano | 2015-06-05 | 3 | -9/+9 |
| |\ \ | |||||
| * \ \ | Merge branch 'fg/document-commit-message-stripping' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ja/tutorial-asciidoctor-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/stripspace-asciidoctor-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/asciidoc-markup-fix' into maint | Junio C Hamano | 2015-06-05 | 19 | -102/+107 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 1 | -2/+33 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | The first half of the seventh batch for 2.5 | Junio C Hamano | 2015-06-05 | 1 | -0/+14 |
* | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-06-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | each_ref_fn: change to take an object_id parameter | Michael Haggerty | 2015-05-25 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jk/at-push-sha1' | Junio C Hamano | 2015-06-05 | 3 | -4/+31 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | for-each-ref: accept "%(push)" formatjk/at-push-sha1 | Jeff King | 2015-05-22 | 1 | -0/+6 |
| * | | | | | | | | | | | sha1_name: implement @{push} shorthand | Jeff King | 2015-05-22 | 1 | -0/+25 |
| * | | | | | | | | | | | remote.c: drop "remote" pointer from "struct branch" | Jeff King | 2015-05-21 | 1 | -4/+0 |
* | | | | | | | | | | | | Sixth batch for 2.5 cycle | Junio C Hamano | 2015-06-01 | 1 | -1/+50 |
* | | | | | | | | | | | | Merge branch 'fm/fetch-raw-sha1' | Junio C Hamano | 2015-06-01 | 3 | -3/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | upload-pack: optionally allow fetching reachable sha1fm/fetch-raw-sha1 | Fredrik Medley | 2015-05-22 | 3 | -1/+15 |
| * | | | | | | | | | | | | config.txt: clarify allowTipSHA1InWant with camelCase | Fredrik Medley | 2015-05-21 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'sg/help-group' | Junio C Hamano | 2015-06-01 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | command-list.txt: add the common groups block | Sébastien Guimmara | 2015-05-21 | 1 | -1/+3 |
| * | | | | | | | | | | | | | command-list: prepare machinery for upcoming "common groups" section | Eric Sunshine | 2015-05-21 | 1 | -0/+4 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'mm/log-format-raw-doc' | Junio C Hamano | 2015-06-01 | 2 | -2/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawmm/log-format-raw-doc | Matthieu Moy | 2015-05-20 | 1 | -1/+4 |
| * | | | | | | | | | | | | | Documentation/log: clarify what --raw means | Matthieu Moy | 2015-05-18 | 1 | -1/+10 |
* | | | | | | | | | | | | | | Merge branch 'dt/cat-file-follow-symlinks' | Junio C Hamano | 2015-06-01 | 1 | -1/+98 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinks | David Turner | 2015-05-20 | 1 | -1/+98 |
* | | | | | | | | | | | | | | | Merge branch 'mc/commit-doc-grammofix' | Junio C Hamano | 2015-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Documentation/git-commit: grammofixmc/commit-doc-grammofix | Michael Coleman | 2015-05-19 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/http-backend-deadlock' | Junio C Hamano | 2015-06-01 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlock | Junio C Hamano | 2015-05-25 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3 | Junio C Hamano | 2015-05-25 | 1 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2 | Jeff King | 2015-05-25 | 1 | -0/+9 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Sync with 2.4.2 | Junio C Hamano | 2015-05-26 | 2 | -1/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Git 2.4.2v2.4.2 | Junio C Hamano | 2015-05-26 | 2 | -1/+47 |
| * | | | | | | | | | | | | | | | | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | Fifth batch for 2.5 cycle | Junio C Hamano | 2015-05-26 | 1 | -6/+28 |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-26 | 3 | -1/+80 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | git-status.txt: advertisement for untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | untracked cache: guard and disable on system changes | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | | | | update-index: test the system before enabling untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | | | | | update-index: manually enable or disable untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | | | untracked cache: save to an index extension | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+58 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Fourth batch for 2.5 cycle | Junio C Hamano | 2015-05-22 | 1 | -0/+75 |
* | | | | | | | | | | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file' | Junio C Hamano | 2015-05-22 | 3 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |