summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lt/shortlog-by-committer'Junio C Hamano2016-12-271-3/+12
|\
| * shortlog: group by committer informationLinus Torvalds2016-12-151-3/+12
* | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-271-0/+25
|\ \
| * | merge: mark usage error strings for translationcp/merge-continueJeff King2016-12-151-2/+2
| * | merge: ensure '--abort' option takes no argumentsChris Packham2016-12-141-0/+4
| * | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-141-0/+21
| |/
* | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2016-12-271-5/+5
|\ \
| * | i18n: clean.c: match string with git-add--interactive.perlVasco Almeida2016-12-141-5/+5
* | | Merge branch 'jc/push-default-explicit'Junio C Hamano2016-12-271-2/+5
|\ \ \
| * | | push: do not use potentially ambiguous default refspecJunio C Hamano2016-10-281-2/+5
* | | | Merge branch 'jk/index-pack-wo-repo-from-stdin'Junio C Hamano2016-12-211-4/+8
|\ \ \ \
| * | | | index-pack: skip collision check when not in repositoryjk/index-pack-wo-repo-from-stdinJeff 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 submodulesvs/submodule-clone-nested-submodules-alternatesVitaly "_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"jc/pull-rebase-ffJunio 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 --amendak/commit-only-allow-emptyAndreas 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 filteringnd/for-each-ref-ignore-caseNguyễ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 clearlyah/grammosAlex 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-162-7/+9
|\ \ \ \ \ \ \
| * | | | | | | worktree list: keep the list sortednd/worktree-list-fixupNguyễ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-161-1/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | rev-parse: fix parent shorthands with --symbolicjk/rev-parse-symbolic-parents-fixJeff King2016-11-161-1/+6
* | | | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-233-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | archive: read local configurationjc/setup-cleanup-fixJunio 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" parameterjk/create-branch-remove-unused-paramJeff King2016-11-092-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs/commit-pptr-simplify'Junio C Hamano2016-10-311-8/+6
|\ \ \ \ \ \
| * | | | | | commit: simplify building parents listrs/commit-pptr-simplifyRené Scharfe2016-10-301-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
View Lorry Controller Status