Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bw/ref-prefix-for-configured-refspec' | Junio C Hamano | 2018-05-30 | 1 | -0/+14 |
|\ | |||||
| * | fetch: generate ref-prefixes when using a configured refspec | Brandon Williams | 2018-05-18 | 1 | -0/+14 |
* | | Merge branch 'ab/get-short-oid' | Junio C Hamano | 2018-05-30 | 1 | -0/+21 |
|\ \ | |||||
| * | | get_short_oid: sort ambiguous objects by type, then SHA-1 | Ævar Arnfjörð Bjarmason | 2018-05-11 | 1 | -0/+21 |
* | | | Merge branch 'jt/partial-clone-proto-v2' | Junio C Hamano | 2018-05-30 | 2 | -0/+126 |
|\ \ \ | |||||
| * | | | {fetch,upload}-pack: support filter in protocol v2 | Jonathan Tan | 2018-05-06 | 1 | -0/+98 |
| * | | | upload-pack: read config when serving protocol v2 | Jonathan Tan | 2018-05-06 | 1 | -0/+14 |
| * | | | upload-pack: fix error message typo | Jonathan Tan | 2018-05-02 | 1 | -0/+14 |
| * | | | Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2 | Junio C Hamano | 2018-05-02 | 3 | -0/+513 |
| |\ \ \ | | |/ / | |/| | | |||||
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | dir: convert struct untracked_cache_dir to object_id | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
| * | | | | Update struct index_state to use struct object_id | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
| * | | | | split-index: convert struct split_index to object_id | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
* | | | | | Merge branch 'sb/blame-color' | Junio C Hamano | 2018-05-30 | 1 | -0/+48 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/blame: add new coloring scheme config | Stefan Beller | 2018-04-24 | 1 | -0/+4 |
| * | | | | | builtin/blame: highlight recently changed lines | Stefan Beller | 2018-04-24 | 1 | -0/+25 |
| * | | | | | builtin/blame: dim uninteresting metadata lines | Stefan Beller | 2018-04-24 | 1 | -0/+19 |
* | | | | | | Merge branch 'cf/submodule-progress-dissociate' | Junio C Hamano | 2018-05-30 | 2 | -0/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule: add --dissociate option to add/update commands | Casey Fitzpatrick | 2018-05-22 | 1 | -0/+17 |
| * | | | | | | submodule: add --progress option to add command | Casey Fitzpatrick | 2018-05-22 | 1 | -0/+16 |
* | | | | | | | Merge branch 'sg/complete-paths' | Junio C Hamano | 2018-05-30 | 1 | -2/+162 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9902-completion: exercise __git_complete_index_file() directly | SZEDER Gábor | 2018-05-21 | 1 | -107/+118 |
| * | | | | | | | completion: improve handling quoted paths in 'git ls-files's output | SZEDER Gábor | 2018-04-17 | 1 | -2/+15 |
| * | | | | | | | t9902-completion: ignore COMPREPLY element order in some tests | SZEDER Gábor | 2018-04-17 | 1 | -2/+4 |
| * | | | | | | | completion: let 'ls-files' and 'diff-index' filter matching paths | SZEDER Gábor | 2018-04-17 | 1 | -0/+1 |
| * | | | | | | | completion: improve handling quoted paths on the command line | SZEDER Gábor | 2018-04-17 | 1 | -2/+44 |
| * | | | | | | | completion: support completing non-ASCII pathnames | SZEDER Gábor | 2018-04-17 | 1 | -1/+1 |
| * | | | | | | | t9902-completion: add tests demonstrating issues with quoted pathnames | SZEDER Gábor | 2018-04-17 | 1 | -0/+91 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ma/create-pseudoref-with-null-old-oid' | Junio C Hamano | 2018-05-30 | 1 | -0/+60 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | refs: handle zero oid for pseudorefs | Martin Ågren | 2018-05-13 | 1 | -2/+2 |
| * | | | | | | | t1400: add tests around adding/deleting pseudorefs | Martin Ågren | 2018-05-13 | 1 | -0/+60 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'bp/status-rename-config' | Junio C Hamano | 2018-05-30 | 1 | -0/+113 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add status config and command line options for rename detection | Ben Peart | 2018-05-13 | 1 | -0/+113 |
* | | | | | | | | Merge branch 'js/use-bug-macro' | Junio C Hamano | 2018-05-30 | 2 | -8/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | BUG_exit_code: fix sparse "symbol not declared" warning | Ramsay Jones | 2018-05-10 | 1 | -1/+0 |
| * | | | | | | | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -8/+8 |
| * | | | | | | | | test-tool: help verifying BUG() code paths | Johannes Schindelin | 2018-05-06 | 1 | -0/+2 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ma/lockfile-cleanup' | Junio C Hamano | 2018-05-30 | 2 | -11/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | lock_file: move static locks into functions | Martin Ågren | 2018-05-10 | 1 | -2/+2 |
| * | | | | | | | | t/helper/test-write-cache: clean up lock-handling | Martin Ågren | 2018-05-10 | 1 | -9/+5 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sg/t6500-no-redirect-of-stdin' | Junio C Hamano | 2018-05-30 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t6050-replace: don't disable stdin for the whole test script | SZEDER Gábor | 2018-05-09 | 1 | -2/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'bp/merge-rename-config' | Junio C Hamano | 2018-05-30 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: add merge.renames config setting | Ben Peart | 2018-05-08 | 1 | -0/+18 |
* | | | | | | | | | Merge branch 'js/sequencer-and-root-commits' | Junio C Hamano | 2018-05-30 | 3 | -9/+88 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase --rebase-merges: root commits can be cousins, too | Johannes Schindelin | 2018-05-06 | 1 | -0/+25 |
| * | | | | | | | | | rebase --rebase-merges: a "merge" into a new root is a fast-forward | Johannes Schindelin | 2018-05-06 | 1 | -0/+13 |
| * | | | | | | | | | sequencer: allow introducing new root commits | Johannes Schindelin | 2018-05-06 | 1 | -0/+34 |
| * | | | | | | | | | rebase -i --root: let the sequencer handle even the initial part | Johannes Schindelin | 2018-05-06 | 2 | -9/+16 |
* | | | | | | | | | | Sync with Git 2.17.1 | Junio C Hamano | 2018-05-29 | 4 | -0/+272 |
|\ \ \ \ \ \ \ \ \ \ |