summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WIP1jc/wip-encode-refnamesJunio C Hamano2017-07-061-5/+25
* WIP0Junio C Hamano2017-07-061-6/+36
* Merge branch 'js/rebase-i-final' into puJunio C Hamano2017-07-057-360/+647
|\
| * rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-06-156-98/+212
| * t3415: test fixup with wrapped onelineJohannes Schindelin2017-06-151-0/+14
| * rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-06-154-39/+116
| * rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-06-154-160/+134
| * t3404: relax rebase.missingCommitsCheck testsJohannes Schindelin2017-06-151-18/+4
| * rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-06-154-26/+70
| * rebase -i: do not invent onelines when expanding/collapsing SHA-1sJohannes Schindelin2017-05-021-1/+6
| * rebase -i: remove useless indentationJohannes Schindelin2017-05-021-7/+7
| * rebase -i: generate the script via rebase--helperJohannes Schindelin2017-05-024-22/+82
| * t3415: verify that an empty instructionFormat is handled as beforeJohannes Schindelin2017-05-021-0/+12
* | Merge branch 'tb/push-to-cygwin-unc-path' into puJunio C Hamano2017-07-055-0/+27
|\ \
| * | cygwin: allow pushing to UNC pathstb/push-to-cygwin-unc-pathTorsten Bögershausen2017-07-055-0/+27
* | | Merge branch 'sb/hashmap-cleanup' into puJunio C Hamano2017-07-0512-75/+107
|\ \ \
| * | | t/helper/test-hashmap: use custom data instead of duplicate cmp functionssb/hashmap-cleanupStefan Beller2017-07-051-18/+16
| * | | name-hash.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-9/+13
| * | | submodule-config.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-6/+12
| * | | remote.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-4/+8
| * | | patch-ids.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-5/+9
| * | | convert/sub-process: drop cast to hashmap_cmp_fnStefan Beller2017-07-053-6/+8
| * | | config.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-4/+6
| * | | builtin/describe: drop hashmap_cmp_fn castStefan Beller2017-07-051-3/+6
| * | | builtin/difftool.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-15/+22
| * | | attr.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-5/+7
* | | | Merge branch 'mt/p4-parse-G-output' into puJunio C Hamano2017-07-052-29/+91
|\ \ \ \
| * | | | git-p4: parse marshal output "p4 -G" in p4 changesMiguel Torroja2017-07-052-29/+91
* | | | | Merge branch 'sb/pull-rebase-submodule' into puJunio C Hamano2017-07-058-41/+193
|\ \ \ \ \
| * | | | | builtin/fetch cleanup: always set default value for submodule recursingStefan Beller2017-06-271-3/+2
| * | | | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-235-16/+157
| * | | | | builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller2017-06-231-9/+10
| * | | | | builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller2017-06-233-16/+27
* | | | | | Merge branch 'sd/branch-copy' into puJunio C Hamano2017-07-0510-48/+484
|\ \ \ \ \ \
| * | | | | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-189-46/+424
| * | | | | | branch: add test for -m renaming multiple config sectionsÆvar Arnfjörð Bjarmason2017-06-181-0/+41
| * | | | | | config: create a function to format section headersSahil Dua2017-06-181-2/+11
* | | | | | | Merge branch 'sb/submodule-doc' into puJunio C Hamano2017-07-054-36/+234
|\ \ \ \ \ \ \
| * | | | | | | submodules: overhaul documentationsb/submodule-docStefan Beller2017-06-224-36/+234
| |/ / / / / /
* | | | | | | Merge branch 'bp/fsmonitor' into puJunio C Hamano2017-07-0518-13/+636
|\ \ \ \ \ \ \
| * | | | | | | fsmonitor: add a sample query-fsmonitor hook script for WatchmanBen Peart2017-06-121-0/+76
| * | | | | | | fsmonitor: add documentation for the fsmonitor extension.Ben Peart2017-06-123-0/+49
| * | | | | | | fsmonitor: add test cases for fsmonitor extensionBen Peart2017-06-121-0/+173
| * | | | | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-06-1212-12/+329
| * | | | | | | dir: make lookup_untracked() available outside of dir.cBen Peart2017-05-202-1/+4
| * | | | | | | bswap: add 64 bit endianness helper get_be64Ben Peart2017-05-201-0/+4
* | | | | | | | Merge branch 'nd/worktree-move' into puJunio C Hamano2017-07-056-11/+337
|\ \ \ \ \ \ \ \
| * | | | | | | | worktree remove: new commandNguyễn Thái Ngọc Duy2017-04-204-10/+121
| * | | | | | | | worktree move: refuse to move worktrees with submodulesNguyễn Thái Ngọc Duy2017-04-201-0/+23
| * | | | | | | | worktree move: accept destination as directoryNguyễn Thái Ngọc Duy2017-04-201-1/+18
View Lorry Controller Status