aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-17
|\
| * push: do not use potentially ambiguous default refspecJunio C Hamano2016-10-28
* | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-17
|\ \
| * | index-pack: skip collision check when not in repositoryJeff King2016-12-16
| * | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-16
* | | Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-17
|\ \ \
| * | | am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-08
| * | | am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-08
| |/ /
* | | Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-17
|\ \ \
| * | | pull: fast-forward "pull --rebase=true"Junio C Hamano2016-11-29
* | | | Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-17
|\ \ \ \
| * | | | commit: remove 'Clever' message for --only --amendAndreas Krey2016-12-09
| * | | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-05
* | | | | Merge branch 'nd/worktree-list-fixup' into maintJunio C Hamano2017-01-17
|\ \ \ \ \
| * | | | | worktree list: keep the list sortedNguyễn Thái Ngọc Duy2016-11-28
| * | | | | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-28
| * | | | | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-28
| * | | | | worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-28
* | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | rev-parse: fix parent shorthands with --symbolicJeff King2016-11-16
* | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \
| * | | | | | archive: read local configurationJunio C Hamano2016-11-22
| * | | | | | mailinfo: read local configurationJunio C Hamano2016-11-22
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | stripspace: respect repository configJohannes Schindelin2016-11-21
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-17
|\ \ \ \ \
| * | | | | create_branch: drop unused "head" parameterJeff King2016-11-09
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/commit-pptr-simplify'Junio C Hamano2016-10-31
|\ \ \ \ \
| * | | | | commit: simplify building parents listRené Scharfe2016-10-30
| | |/ / / | |/| | |
* | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-10-31
|\ \ \ \ \
| * | | | | pkt-line: rename packet_write() to packet_write_fmt()Lars Schneider2016-10-17
* | | | | | Merge branch 'ls/git-open-cloexec'Junio C Hamano2016-10-31
|\ \ \ \ \ \
| * | | | | | sha1_file: rename git_open_noatime() to git_open()Lars Schneider2016-10-25
* | | | | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-27
|\ \ \ \ \ \ \
| * | | | | | | commit: don't be fooled by ita entries when creating initial commitNguyễn Thái Ngọc Duy2016-10-24
| * | | | | | | commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-24
* | | | | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-10-27
|\ \ \ \ \ \ \ \
| * | | | | | | | sequencer: get rid of the subcommand fieldJohannes Schindelin2016-10-21
| * | | | | | | | sequencer: plug memory leaks for the option valuesJohannes Schindelin2016-10-21
| * | | | | | | | sequencer: use memoized sequencer directory pathJohannes Schindelin2016-10-17
| * | | | | | | | sequencer: use static initializers for replay_optsJohannes Schindelin2016-10-17
* | | | | | | | | Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: ignore trailing slash in relative urlStefan Beller2016-10-10
| * | | | | | | | | submodule: ignore trailing slash on superproject URLStefan Beller2016-10-10
* | | | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | find_unique_abbrev: use 4-buffer ringJeff King2016-10-26
* | | | | | | | | | | Merge branch 'jc/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | transport: allow summary-width to be computed dynamicallyJunio C Hamano2016-10-21
| * | | | | | | | | | | fetch: pass summary_width down the callchainJunio C Hamano2016-10-21
* | | | | | | | | | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |