Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'nd/worktree-kill-parse-ref' | Junio C Hamano | 2017-09-10 |
|\ | |||
| * | branch: fix branch renaming not updating HEADs correctly | Nguyễn Thái Ngọc Duy | 2017-08-24 |
* | | Merge branch 'mm/send-email-cc-cruft' | Junio C Hamano | 2017-09-10 |
|\ \ | |||
| * | | send-email: fix garbage removal after address | Matthieu Moy | 2017-08-24 |
| * | | Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ | |||
| * \ \ | Merge branch 'jb/t8008-cleanup' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jk/reflog-walk' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | treewide: correct several "up-to-date" to "up to date" | Martin Ågren | 2017-08-23 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'rs/archive-excluded-directory' | Junio C Hamano | 2017-09-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | archive: don't queue excluded directories | René Scharfe | 2017-08-19 |
| * | | | | | | | | t5001: add tests for export-ignore attributes and exclude pathspecs | René Scharfe | 2017-08-19 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'ks/branch-set-upstream' | Junio C Hamano | 2017-09-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | builtin/branch: stop supporting the "--set-upstream" option | Kaartic Sivaraam | 2017-08-17 |
| * | | | | | | | | t3200: cleanup cruft of a test | Kaartic Sivaraam | 2017-08-17 |
* | | | | | | | | | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | merge: save merge state earlier | Michael J Gruber | 2017-08-23 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved | Junio C Hamano | 2017-08-22 |
| * | | | | | | | | | t4200: parameterize "rerere gc" custom expiry test | Junio C Hamano | 2017-08-22 |
| * | | | | | | | | | t4200: gather "rerere gc" together | Junio C Hamano | 2017-08-22 |
| * | | | | | | | | | t4200: make "rerere gc" test more robust | Junio C Hamano | 2017-08-22 |
| * | | | | | | | | | t4200: give us a clean slate after "rerere gc" tests | Junio C Hamano | 2017-08-22 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'kw/write-index-reduce-alloc' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | perf: add test for writing the index | Kevin Willford | 2017-08-21 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | submodule: remove gitmodules_config | Brandon Williams | 2017-08-03 |
| * | | | | | | | | | submodule-config: remove support for overlaying repository config | Brandon Williams | 2017-08-03 |
| * | | | | | | | | | diff: stop allowing diff to have submodules configured in .git/config | Brandon Williams | 2017-08-03 |
| * | | | | | | | | | t7411: check configuration parsing errors | Brandon Williams | 2017-08-02 |
| * | | | | | | | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 |
| |\ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'tb/apply-with-crlf' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | apply: file commited with CRLF should roundtrip diff and apply | Torsten Bögershausen | 2017-08-19 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jt/stash-tests' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | stash: add a test for stashing in a detached state | Joel Teichroeb | 2017-08-19 |
| * | | | | | | | | | | | stash: add a test for when apply fails during stash branch | Joel Teichroeb | 2017-08-19 |
| * | | | | | | | | | | | stash: add a test for stash create with no files | Joel Teichroeb | 2017-08-19 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jk/trailers-parse' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | pretty: support normalization options for %(trailers) | Jeff King | 2017-08-15 |
| * | | | | | | | | | | | t4205: refactor %(trailers) tests | Jeff King | 2017-08-15 |
| * | | | | | | | | | | | interpret-trailers: add an option to unfold values | Jeff King | 2017-08-15 |
| * | | | | | | | | | | | interpret-trailers: add an option to show only existing trailers | Jeff King | 2017-08-15 |
| * | | | | | | | | | | | interpret-trailers: add an option to show only the trailers | Jeff King | 2017-08-15 |
* | | | | | | | | | | | | Merge branch 'pb/trailers-from-command-line' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | interpret-trailers: add options for actions | Paolo Bonzini | 2017-08-14 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jt/diff-color-move-fix' | Junio C Hamano | 2017-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | diff: define block by number of alphanumeric chars | Jonathan Tan | 2017-08-16 |
| * | | | | | | | | | | | | diff: respect MIN_BLOCK_LENGTH for last block | Jonathan Tan | 2017-08-16 |