summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* commit: add support for --fixup <commit> -m"<extra message>"Ævar Arnfjörð Bjarmason2017-12-221-3/+5
* Merge branch 'ar/unconfuse-three-dots'Junio C Hamano2017-12-191-2/+8
|\
| * checkout: describe_detached_head: remove ellipsis after committishAnn T Ropea2017-12-061-2/+8
* | Merge branch 'tg/worktree-create-tracking'Junio C Hamano2017-12-192-41/+46
|\ \
| * | add worktree.guessRemote config optionThomas Gummerer2017-12-061-2/+12
| * | worktree: add --guess-remote flag to add subcommandThomas Gummerer2017-12-061-0/+10
| * | worktree: make add <path> <branch> dwimThomas Gummerer2017-11-271-0/+16
| * | worktree: add --[no-]track option to the add subcommandThomas Gummerer2017-11-271-0/+8
| * | checkout: factor out functions to new lib fileThomas Gummerer2017-11-271-40/+1
* | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-12-191-0/+2
|\ \ \
| * | | diff-tree: read the index so attribute checks work in bare repositoriesBrandon Williams2017-12-061-0/+2
* | | | Merge branch 'bw/pathspec-match-submodule-boundary'Junio C Hamano2017-12-191-0/+1
|\ \ \ \
| * | | | pathspec: only match across submodule boundaries when requestedBrandon Williams2017-12-051-0/+1
* | | | | Merge branch 'pc/submodule-helper'Junio C Hamano2017-12-131-1/+1
|\ \ \ \ \
| * | | | | submodule--helper.c: i18n: add a missing space in messageJean-Noel Avila2017-11-261-1/+1
* | | | | | Merge branch 'ra/decorate-limit-refs'Junio C Hamano2017-12-131-1/+9
|\ \ \ \ \ \
| * | | | | | log: add option to choose which refs to decorateRafael Ascensão2017-11-221-1/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-134-4/+4
|\ \ \ \ \ \
| * | | | | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-134-4/+4
* | | | | | | Merge branch 'bw/protocol-v1'Junio C Hamano2017-12-061-0/+17
|\ \ \ \ \ \ \
| * | | | | | | upload-pack, receive-pack: introduce protocol version 1Brandon Williams2017-10-171-0/+17
* | | | | | | | Merge branch 'rd/doc-notes-prune-fix'Junio C Hamano2017-12-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: correct 'git notes prune' options to '[-n] [-v]'Robert P. J. Day2017-11-221-1/+1
* | | | | | | | | Merge branch 'rd/man-prune-progress'Junio C Hamano2017-12-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | prune: add "--progress" to man page and usage msgRobert P. J. Day2017-11-221-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'hm/config-parse-expiry-date'Junio C Hamano2017-12-062-13/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: add --expiry-dateHaaris Mehmood2017-11-182-13/+11
* | | | | | | | | | Merge branch 'ma/branch-list-paginate'Junio C Hamano2017-11-281-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: change default of `pager.branch` to "on"Martin Ågren2017-11-201-1/+1
| * | | | | | | | | | branch: respect `pager.branch` in list-mode onlyMartin Ågren2017-11-201-0/+3
* | | | | | | | | | | Merge branch 'jc/branch-name-sanity'Junio C Hamano2017-11-282-12/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/branch: remove redundant check for HEADKaartic Sivaraam2017-11-151-3/+0
| * | | | | | | | | | | branch: split validate_new_branchname() into twoJunio C Hamano2017-10-132-9/+9
* | | | | | | | | | | | Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano2017-11-271-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pull: pass -4/-6 option to 'git fetch'Shuyu Wei2017-11-211-0/+12
* | | | | | | | | | | | | Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-271-2/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add: introduce "--renormalize"Torsten Bögershausen2017-11-171-2/+26
* | | | | | | | | | | | | | Merge branch 'tz/notes-error-to-stderr'Junio C Hamano2017-11-271-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | notes: send "Automatic notes merge failed" messages to stderrTodd Zullinger2017-11-151-4/+4
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-212-3/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | update-index: add fsmonitor support to update-indexBen Peart2017-10-011-1/+32
| * | | | | | | | | | | | ls-files: Add support in ls-files to display the fsmonitor valid bitBen Peart2017-10-011-2/+6
| * | | | | | | | | | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-0/+2
| * | | | | | | | | | | | update-index: add a new --force-write-index optionBen Peart2017-09-241-1/+4
* | | | | | | | | | | | | Merge branch 'bp/read-index-from-skip-verification'Junio C Hamano2017-11-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | read_index_from(): speed index loading by skipping verification of the entry ...Ben Peart2017-11-081-0/+1
| * | | | | | | | | | | | | Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano2017-10-234-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/no-sign-compare' into maintJunio C Hamano2017-10-231-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ma/ts-cleanups' into maintJunio C Hamano2017-10-231-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2017-10-231-14/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \