Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/push-default-explicit' into maint | Junio C Hamano | 2017-01-17 |
|\ | |||
| * | push: do not use potentially ambiguous default refspec | Junio C Hamano | 2016-10-28 |
* | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint | Junio C Hamano | 2017-01-17 |
|\ \ | |||
| * | | index-pack: skip collision check when not in repository | Jeff King | 2016-12-16 |
| * | | index-pack: complain when --stdin is used outside of a repo | Jeff King | 2016-12-16 |
* | | | Merge branch 'sb/sequencer-abort-safety' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ | |||
| * | | | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 |
| * | | | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 |
| |/ / | |||
* | | | Merge branch 'jc/pull-rebase-ff' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ | |||
| * | | | pull: fast-forward "pull --rebase=true" | Junio C Hamano | 2016-11-29 |
* | | | | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ | |||
| * | | | | commit: remove 'Clever' message for --only --amend | Andreas Krey | 2016-12-09 |
| * | | | | commit: make --only --allow-empty work without paths | Andreas Krey | 2016-12-05 |
* | | | | | Merge branch 'nd/worktree-list-fixup' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ | |||
| * | | | | | worktree list: keep the list sorted | Nguyễn Thái Ngọc Duy | 2016-11-28 |
| * | | | | | worktree.c: get_worktrees() takes a new flag argument | Nguyễn Thái Ngọc Duy | 2016-11-28 |
| * | | | | | get_worktrees() must return main worktree as first item even on error | Nguyễn Thái Ngọc Duy | 2016-11-28 |
| * | | | | | worktree: reorder an if statement | Nguyễn Thái Ngọc Duy | 2016-11-28 |
* | | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||
| * | | | | | rev-parse: fix parent shorthands with --symbolic | Jeff King | 2016-11-16 |
* | | | | | | Merge branch 'jc/setup-cleanup-fix' | Junio C Hamano | 2016-11-23 |
|\ \ \ \ \ \ | |||
| * | | | | | | archive: read local configuration | Junio C Hamano | 2016-11-22 |
| * | | | | | | mailinfo: read local configuration | Junio C Hamano | 2016-11-22 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'js/rebase-i-commentchar-fix' | Junio C Hamano | 2016-11-23 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | stripspace: respect repository config | Johannes Schindelin | 2016-11-21 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'jk/create-branch-remove-unused-param' | Junio C Hamano | 2016-11-17 |
|\ \ \ \ \ | |||
| * | | | | | create_branch: drop unused "head" parameter | Jeff King | 2016-11-09 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'rs/commit-pptr-simplify' | Junio C Hamano | 2016-10-31 |
|\ \ \ \ \ | |||
| * | | | | | commit: simplify building parents list | René Scharfe | 2016-10-30 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-10-31 |
|\ \ \ \ \ | |||
| * | | | | | pkt-line: rename packet_write() to packet_write_fmt() | Lars Schneider | 2016-10-17 |
* | | | | | | Merge branch 'ls/git-open-cloexec' | Junio C Hamano | 2016-10-31 |
|\ \ \ \ \ \ | |||
| * | | | | | | sha1_file: rename git_open_noatime() to git_open() | Lars Schneider | 2016-10-25 |
* | | | | | | | Merge branch 'nd/ita-empty-commit' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | commit: don't be fooled by ita entries when creating initial commit | Nguyễn Thái Ngọc Duy | 2016-10-24 |
| * | | | | | | | commit: fix empty commit creation when there's no changes but ita entries | Nguyễn Thái Ngọc Duy | 2016-10-24 |
* | | | | | | | | Merge branch 'js/prepare-sequencer' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | sequencer: get rid of the subcommand field | Johannes Schindelin | 2016-10-21 |
| * | | | | | | | | sequencer: plug memory leaks for the option values | Johannes Schindelin | 2016-10-21 |
| * | | | | | | | | sequencer: use memoized sequencer directory path | Johannes Schindelin | 2016-10-17 |
| * | | | | | | | | sequencer: use static initializers for replay_opts | Johannes Schindelin | 2016-10-17 |
* | | | | | | | | | Merge branch 'sb/submodule-ignore-trailing-slash' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | submodule: ignore trailing slash in relative url | Stefan Beller | 2016-10-10 |
| * | | | | | | | | | submodule: ignore trailing slash on superproject URL | Stefan Beller | 2016-10-10 |
* | | | | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | find_unique_abbrev: use 4-buffer ring | Jeff King | 2016-10-26 |
* | | | | | | | | | | | Merge branch 'jc/abbrev-auto' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | transport: allow summary-width to be computed dynamically | Junio C Hamano | 2016-10-21 |
| * | | | | | | | | | | | fetch: pass summary_width down the callchain | Junio C Hamano | 2016-10-21 |
* | | | | | | | | | | | | Merge branch 'lt/abbrev-auto' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | | |