summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | pathspec: create parse_long_magic functionBrandon Williams2017-01-081-35/+57
| * | | | | pathspec: create parse_short_magic functionBrandon Williams2017-01-081-18/+36
| * | | | | pathspec: factor global magic into its own functionBrandon Williams2017-01-081-49/+78
| * | | | | pathspec: simpler logic to prefix original pathspec elementsBrandon Williams2017-01-081-20/+13
| * | | | | pathspec: always show mnemonic and name in unsupported_magicBrandon Williams2017-01-081-15/+9
| * | | | | pathspec: remove unused variable from unsupported_magicBrandon Williams2017-01-081-3/+2
| * | | | | pathspec: copy and free owned memoryBrandon Williams2017-01-082-6/+21
| * | | | | pathspec: remove the deprecated get_pathspec functionBrandon Williams2017-01-084-43/+3
| * | | | | ls-tree: convert show_recursive to use the pathspec struct interfaceBrandon Williams2017-01-081-9/+7
| * | | | | dir: convert fill_directory to use the pathspec struct interfaceBrandon Williams2017-01-081-4/+8
| * | | | | dir: remove struct path_simplifyBrandon Williams2017-01-081-103/+76
| * | | | | mv: remove use of deprecated 'get_pathspec()'Brandon Williams2017-01-081-19/+31
* | | | | | Merge branch 'js/mingw-test-push-unc-path'Junio C Hamano2017-01-181-0/+48
|\ \ \ \ \ \
| * | | | | | mingw: add a regression test for pushing to UNC pathsjs/mingw-test-push-unc-pathJohannes Schindelin2017-01-071-0/+48
* | | | | | | Merge branch 'sb/submodule-cleanup-export-git-dir-env'Junio C Hamano2017-01-181-1/+2
|\ \ \ \ \ \ \
| * | | | | | | submodule.c: use GIT_DIR_ENVIRONMENT consistentlysb/submodule-cleanup-export-git-dir-envStefan Beller2017-01-071-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'km/branch-get-push-while-detached'Junio C Hamano2017-01-182-3/+9
|\ \ \ \ \ \ \
| * | | | | | | branch_get_push: do not segfault when HEAD is detachedkm/branch-get-push-while-detachedKyle Meyer2017-01-072-3/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jk/rebase-i-squash-count-fix'Junio C Hamano2017-01-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | rebase--interactive: count squash commits above 10 correctlyjk/rebase-i-squash-count-fixJeff King2017-01-071-1/+1
* | | | | | | | Merge branch 'jk/blame-fixes'Junio C Hamano2017-01-183-10/+166
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-072-9/+131
| * | | | | | | | blame: handle --no-abbrevJeff King2017-01-072-0/+6
| * | | | | | | | blame: fix alignment with --abbrev=40Jeff King2017-01-072-1/+29
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/archive-zip-userdiff-config'Junio C Hamano2017-01-182-4/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | archive-zip: load userdiff configjk/archive-zip-userdiff-configJeff King2017-01-072-4/+25
| |/ / / / / / /
* | | | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc'Junio C Hamano2017-01-184-6/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gcDavid Turner2016-12-292-5/+12
| * | | | | | | | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-292-1/+33
| |/ / / / / / /
* | | | | | | | Merge branch 'ls/p4-retry-thrice'Junio C Hamano2017-01-182-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thriceIgor Kushnir2016-12-292-1/+5
* | | | | | | | | Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-01-184-129/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rm: absorb a submodules git dir before deletionStefan Beller2016-12-272-87/+36
| * | | | | | | | | submodule: rename and add flags to ok_to_remove_submoduleStefan Beller2016-12-273-14/+45
| * | | | | | | | | submodule: modernize ok_to_remove_submodule to use argv_arrayStefan Beller2016-12-271-10/+4
| * | | | | | | | | submodule.h: add extern keyword to functionsStefan Beller2016-12-271-25/+30
* | | | | | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-1820-117/+904
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: search history of moved submodulesBrandon Williams2016-12-222-2/+59
| * | | | | | | | | | grep: enable recurse-submodules to work on <tree> objectsBrandon Williams2016-12-224-9/+211
| * | | | | | | | | | grep: optionally recurse into submodulesBrandon Williams2016-12-224-20/+386
| * | | | | | | | | | grep: add submodules as a grep source typeBrandon Williams2016-12-222-1/+16
| * | | | | | | | | | submodules: load gitmodules file from commit sha1Brandon Williams2016-12-226-7/+25
| * | | | | | | | | | submodules: add helper to determine if a submodule is initializedBrandon Williams2016-12-222-0/+24
| * | | | | | | | | | submodules: add helper to determine if a submodule is populatedBrandon Williams2016-12-222-0/+16
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | real_path: canonicalize directory separators in root partsJohannes Sixt2016-12-221-12/+17
| * | | | | | | | | real_path: have callers use real_pathdup and strbuf_realpathBrandon Williams2016-12-127-13/+16
| * | | | | | | | | real_path: create real_pathdupBrandon Williams2016-12-122-0/+14
| * | | | | | | | | real_path: convert real_path_internal to strbuf_realpathBrandon Williams2016-12-122-28/+27
| * | | | | | | | | real_path: resolve symlinks by handBrandon Williams2016-12-121-61/+129
* | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2017-01-1815-382/+1901
|\ \ \ \ \ \ \ \ \ \