summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* update-index: warn in case of split-index incoherencyChristian Couder2017-03-011-1/+10
* split-index: add {add,remove}_split_index() functionsChristian Couder2017-03-011-12/+6
* Merge branch 'jk/index-pack-wo-repo-from-stdin'Junio C Hamano2016-12-211-4/+8
|\
| * index-pack: skip collision check when not in repositoryJeff King2016-12-161-4/+6
| * index-pack: complain when --stdin is used outside of a repoJeff King2016-12-161-0/+2
* | Merge branch 'vs/submodule-clone-nested-submodules-alternates'Junio C Hamano2016-12-211-2/+17
|\ \
| * | submodule--helper: set alternateLocation for cloned submodulesVitaly "_Vi" Shukela2016-12-121-2/+17
| |/
* | Merge branch 'sb/sequencer-abort-safety'Junio C Hamano2016-12-211-2/+2
|\ \
| * | am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-081-1/+1
| * | am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-081-1/+1
| |/
* | Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-191-4/+18
|\ \
| * | pull: fast-forward "pull --rebase=true"Junio C Hamano2016-11-291-4/+18
* | | Merge branch 'jc/lock-report-on-error'Junio C Hamano2016-12-1912-19/+20
|\ \ \
| * | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-0712-19/+20
| | |/ | |/|
* | | Merge branch 'ak/commit-only-allow-empty'Junio C Hamano2016-12-191-3/+1
|\ \ \
| * | | commit: remove 'Clever' message for --only --amendAndreas Krey2016-12-091-2/+0
| * | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-051-1/+1
* | | | Merge branch 'nd/for-each-ref-ignore-case'Junio C Hamano2016-12-193-10/+22
|\ \ \ \
| * | | | tag, branch, for-each-ref: add --ignore-case for sorting and filteringNguyễn Thái Ngọc Duy2016-12-053-10/+22
| | |/ / | |/| |
* | | | Merge branch 'ah/grammos'Junio C Hamano2016-12-193-4/+4
|\ \ \ \
| * | | | clone,fetch: explain the shallow-clone option a little more clearlyAlex Henrie2016-12-052-2/+2
| * | | | receive-pack: improve English grammar of denyCurrentBranch messageAlex Henrie2016-12-051-2/+2
| |/ / /
* | | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2016-12-191-1/+1
|\ \ \ \
| * | | | commit: make ignore_non_trailer take buf/lenJonathan Tan2016-11-291-1/+1
* | | | | Merge branch 'nd/worktree-list-fixup'Junio C Hamano2016-12-172-7/+9
|\ \ \ \ \
| * | | | | worktree list: keep the list sortedNguyễn Thái Ngọc Duy2016-11-281-1/+1
| * | | | | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-282-4/+4
| * | | | | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-281-2/+4
| * | | | | worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-281-3/+3
* | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix'Junio C Hamano2016-12-171-1/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | rev-parse: fix parent shorthands with --symbolicJeff King2016-11-161-1/+6
* | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-233-8/+19
|\ \ \ \ \ \
| * | | | | | archive: read local configurationJunio C Hamano2016-11-222-4/+4
| * | | | | | mailinfo: read local configurationJunio C Hamano2016-11-221-4/+15
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-231-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | stripspace: respect repository configJohannes Schindelin2016-11-211-1/+3
* | | | | | Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-172-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | create_branch: drop unused "head" parameterJeff King2016-11-092-3/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/commit-pptr-simplify'Junio C Hamano2016-10-311-8/+6
|\ \ \ \ \
| * | | | | commit: simplify building parents listRené Scharfe2016-10-311-8/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-10-314-8/+8
|\ \ \ \ \
| * | | | | pkt-line: rename packet_write() to packet_write_fmt()Lars Schneider2016-10-174-8/+8
* | | | | | Merge branch 'ls/git-open-cloexec'Junio C Hamano2016-10-311-1/+1
|\ \ \ \ \ \
| * | | | | | sha1_file: rename git_open_noatime() to git_open()Lars Schneider2016-10-251-1/+1
* | | | | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-4/+9
|\ \ \ \ \ \ \
| * | | | | | | commit: don't be fooled by ita entries when creating initial commitNguyễn Thái Ngọc Duy2016-10-241-3/+8
| * | | | | | | commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-241-1/+1
* | | | | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-10-272-25/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | sequencer: get rid of the subcommand fieldJohannes Schindelin2016-10-211-20/+16
| * | | | | | | | sequencer: plug memory leaks for the option valuesJohannes Schindelin2016-10-211-0/+4