summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano2018-03-211-1/+1
|\
| * -Wuninitialized: remove some 'init-self' workaroundsRamsay Jones2018-03-201-1/+1
* | Merge branch 'jt/transfer-fsck-with-promissor'Junio C Hamano2018-03-211-2/+4
|\ \
| * | index-pack: support checking objects but not linksJonathan Tan2018-03-151-2/+4
* | | Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano2018-03-215-26/+17
|\ \ \
| * | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-indexMartin Ågren2018-03-015-26/+17
* | | | Merge branch 'ma/config-page-only-in-list-mode'Junio C Hamano2018-03-211-0/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | config: change default of `pager.config` to "on"ma/config-page-only-in-list-modeMartin Ågren2018-02-211-1/+1
| * | | config: respect `pager.config` in list/get-mode onlyMartin Ågren2018-02-211-0/+10
* | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-1420-28/+42
|\ \ \ \
| * | | | completion: use __gitcomp_builtin in _git_worktreeNguyễn Thái Ngọc Duy2018-02-091-1/+1
| * | | | completion: use __gitcomp_builtin in _git_rmNguyễn Thái Ngọc Duy2018-02-091-1/+1
| * | | | completion: use __gitcomp_builtin in _git_replaceNguyễn Thái Ngọc Duy2018-02-091-1/+2
| * | | | remote: force completing --mirror= instead of --mirrorNguyễn Thái Ngọc Duy2018-02-091-1/+1
| * | | | completion: use __gitcomp_builtin in _git_pushNguyễn Thái Ngọc Duy2018-02-091-1/+1
| * | | | completion: use __gitcomp_builtin in _git_notesNguyễn Thái Ngọc Duy2018-02-091-2/+2
| * | | | completion: use __gitcomp_builtin in _git_mvNguyễn Thái Ngọc Duy2018-02-091-1/+2
| * | | | completion: use __gitcomp_builtin in _git_ls_remoteNguyễn Thái Ngọc Duy2018-02-091-2/+3
| * | | | completion: use __gitcomp_builtin in _git_grepNguyễn Thái Ngọc Duy2018-02-091-5/+8
| * | | | completion: use __gitcomp_builtin in _git_gcNguyễn Thái Ngọc Duy2018-02-091-2/+5
| * | | | completion: use __gitcomp_builtin in _git_cleanNguyễn Thái Ngọc Duy2018-02-091-1/+1
| * | | | completion: use __gitcomp_builtin in _git_checkoutNguyễn Thái Ngọc Duy2018-02-091-2/+5
| * | | | completion: use __gitcomp_builtin in _git_branchNguyễn Thái Ngọc Duy2018-02-091-1/+1
| * | | | parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy2018-02-0913-14/+16
| |/ / /
* | | | Merge branch 'nd/object-allocation-comments'Junio C Hamano2018-03-144-0/+4
|\ \ \ \
| * | | | object.h: update flag allocation commentNguyễn Thái Ngọc Duy2018-03-064-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'nd/worktree-move'Junio C Hamano2018-03-141-0/+220
|\ \ \ \
| * | | | worktree remove: allow it when $GIT_WORK_TREE is already goneNguyễn Thái Ngọc Duy2018-02-121-5/+7
| * | | | worktree remove: new commandNguyễn Thái Ngọc Duy2018-02-121-1/+133
| * | | | worktree move: refuse to move worktrees with submodulesNguyễn Thái Ngọc Duy2018-02-121-0/+23
| * | | | worktree move: accept destination as directoryNguyễn Thái Ngọc Duy2018-02-121-1/+10
| * | | | worktree move: new commandNguyễn Thái Ngọc Duy2018-02-121-0/+53
* | | | | Merge branch 'ab/gc-auto-in-commit'Junio C Hamano2018-03-081-0/+2
|\ \ \ \ \
| * | | | | commit: run git gc --auto just before the post-commit hookab/gc-auto-in-commitÆvar Arnfjörð Bjarmason2018-03-011-0/+2
| | |/ / / | |/| | |
| * | | | Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano2018-02-271-3/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'rv/grep-cleanup'Junio C Hamano2018-03-081-13/+20
|\ \ \ \ \ \ \
| * | | | | | | grep: simplify grep_oid and grep_filerv/grep-cleanupRasmus Villemoes2018-02-231-4/+2
| * | | | | | | grep: move grep_source_init outside critical sectionRasmus Villemoes2018-02-231-9/+18
| |/ / / / / /
* | | | | | | Merge branch 'jh/status-no-ahead-behind'Junio C Hamano2018-03-082-1/+8
|\ \ \ \ \ \ \
| * | | | | | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behindJeff Hostetler2018-01-241-1/+1
| * | | | | | | status: add --[no-]ahead-behind to status and commit for V2 format.Jeff Hostetler2018-01-241-0/+7
* | | | | | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-0621-253/+253
|\ \ \ \ \ \ \ \
| * | | | | | | | replace: rename 'new' variablesbw/c-plus-plusBrandon Williams2018-02-221-17/+17
| * | | | | | | | init-db: rename 'template' variablesBrandon Williams2018-02-221-15/+15
| * | | | | | | | remote: rename 'new' variablesBrandon Williams2018-02-221-33/+33
| * | | | | | | | reflog: rename 'new' variablesBrandon Williams2018-02-221-4/+4
| * | | | | | | | pack-redundant: rename 'new' variablesBrandon Williams2018-02-221-27/+27
| * | | | | | | | help: rename 'new' variablesBrandon Williams2018-02-221-5/+5
| * | | | | | | | checkout: rename 'new' variablesBrandon Williams2018-02-221-98/+98