summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-171-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 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-171-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' into maintJunio C Hamano2017-01-171-4/+18
|\ \
| * | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-291-4/+18
* | | Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-171-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/worktree-list-fixup' into maintJunio C Hamano2017-01-172-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' into maintJunio C Hamano2017-01-171-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
* | | | | | 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 commitnd/ita-empty-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
| * | | | | | | | sequencer: use memoized sequencer directory pathJohannes Schindelin2016-10-171-1/+1
| * | | | | | | | sequencer: use static initializers for replay_optsJohannes Schindelin2016-10-171-4/+2
* | | | | | | | | Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-271-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: ignore trailing slash in relative urlStefan Beller2016-10-101-0/+2
| * | | | | | | | | submodule: ignore trailing slash on superproject URLStefan Beller2016-10-101-2/+4
* | | | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-272-16/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | find_unique_abbrev: use 4-buffer ringJeff King2016-10-262-16/+11
* | | | | | | | | | | Merge branch 'jc/abbrev-auto'Junio C Hamano2016-10-271-16/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | transport: allow summary-width to be computed dynamicallyJunio C Hamano2016-10-211-2/+2
| * | | | | | | | | | | fetch: pass summary_width down the callchainJunio C Hamano2016-10-211-16/+21
* | | | | | | | | | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-272-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | abbrev: prepare for new world orderJunio C Hamano2016-10-031-2/+3
| * | | | | | | | | | abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizingJunio C Hamano2016-10-031-0/+3
View Lorry Controller Status