Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update-index: warn in case of split-index incoherency | Christian Couder | 2017-03-01 | 1 | -1/+10 |
* | split-index: add {add,remove}_split_index() functions | Christian Couder | 2017-03-01 | 1 | -12/+6 |
* | Merge branch 'jk/index-pack-wo-repo-from-stdin' | Junio C Hamano | 2016-12-21 | 1 | -4/+8 |
|\ | |||||
| * | index-pack: skip collision check when not in repository | Jeff King | 2016-12-16 | 1 | -4/+6 |
| * | index-pack: complain when --stdin is used outside of a repo | Jeff King | 2016-12-16 | 1 | -0/+2 |
* | | Merge branch 'vs/submodule-clone-nested-submodules-alternates' | Junio C Hamano | 2016-12-21 | 1 | -2/+17 |
|\ \ | |||||
| * | | submodule--helper: set alternateLocation for cloned submodules | Vitaly "_Vi" Shukela | 2016-12-12 | 1 | -2/+17 |
| |/ | |||||
* | | Merge branch 'sb/sequencer-abort-safety' | Junio C Hamano | 2016-12-21 | 1 | -2/+2 |
|\ \ | |||||
| * | | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 | 1 | -1/+1 |
| * | | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'jc/pull-rebase-ff' | Junio C Hamano | 2016-12-19 | 1 | -4/+18 |
|\ \ | |||||
| * | | pull: fast-forward "pull --rebase=true" | Junio C Hamano | 2016-11-29 | 1 | -4/+18 |
* | | | Merge branch 'jc/lock-report-on-error' | Junio C Hamano | 2016-12-19 | 12 | -19/+20 |
|\ \ \ | |||||
| * | | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | 12 | -19/+20 |
| | |/ | |/| | |||||
* | | | Merge branch 'ak/commit-only-allow-empty' | Junio C Hamano | 2016-12-19 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | commit: remove 'Clever' message for --only --amend | Andreas Krey | 2016-12-09 | 1 | -2/+0 |
| * | | | commit: make --only --allow-empty work without paths | Andreas Krey | 2016-12-05 | 1 | -1/+1 |
* | | | | Merge branch 'nd/for-each-ref-ignore-case' | Junio C Hamano | 2016-12-19 | 3 | -10/+22 |
|\ \ \ \ | |||||
| * | | | | tag, branch, for-each-ref: add --ignore-case for sorting and filtering | Nguyễn Thái Ngọc Duy | 2016-12-05 | 3 | -10/+22 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ah/grammos' | Junio C Hamano | 2016-12-19 | 3 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | clone,fetch: explain the shallow-clone option a little more clearly | Alex Henrie | 2016-12-05 | 2 | -2/+2 |
| * | | | | receive-pack: improve English grammar of denyCurrentBranch message | Alex Henrie | 2016-12-05 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'jt/use-trailer-api-in-commands' | Junio C Hamano | 2016-12-19 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | commit: make ignore_non_trailer take buf/len | Jonathan Tan | 2016-11-29 | 1 | -1/+1 |
* | | | | | Merge branch 'nd/worktree-list-fixup' | Junio C Hamano | 2016-12-17 | 2 | -7/+9 |
|\ \ \ \ \ | |||||
| * | | | | | worktree list: keep the list sorted | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -1/+1 |
| * | | | | | worktree.c: get_worktrees() takes a new flag argument | Nguyễn Thái Ngọc Duy | 2016-11-28 | 2 | -4/+4 |
| * | | | | | get_worktrees() must return main worktree as first item even on error | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -2/+4 |
| * | | | | | worktree: reorder an if statement | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -3/+3 |
* | | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix' | Junio C Hamano | 2016-12-17 | 1 | -1/+6 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | rev-parse: fix parent shorthands with --symbolic | Jeff King | 2016-11-16 | 1 | -1/+6 |
* | | | | | | Merge branch 'jc/setup-cleanup-fix' | Junio C Hamano | 2016-11-23 | 3 | -8/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | archive: read local configuration | Junio C Hamano | 2016-11-22 | 2 | -4/+4 |
| * | | | | | | mailinfo: read local configuration | Junio C Hamano | 2016-11-22 | 1 | -4/+15 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/rebase-i-commentchar-fix' | Junio C Hamano | 2016-11-23 | 1 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | stripspace: respect repository config | Johannes Schindelin | 2016-11-21 | 1 | -1/+3 |
* | | | | | | Merge branch 'jk/create-branch-remove-unused-param' | Junio C Hamano | 2016-11-17 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | create_branch: drop unused "head" parameter | Jeff King | 2016-11-09 | 2 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'rs/commit-pptr-simplify' | Junio C Hamano | 2016-10-31 | 1 | -8/+6 |
|\ \ \ \ \ | |||||
| * | | | | | commit: simplify building parents list | René Scharfe | 2016-10-31 | 1 | -8/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-10-31 | 4 | -8/+8 |
|\ \ \ \ \ | |||||
| * | | | | | pkt-line: rename packet_write() to packet_write_fmt() | Lars Schneider | 2016-10-17 | 4 | -8/+8 |
* | | | | | | Merge branch 'ls/git-open-cloexec' | Junio C Hamano | 2016-10-31 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sha1_file: rename git_open_noatime() to git_open() | Lars Schneider | 2016-10-25 | 1 | -1/+1 |
* | | | | | | | Merge branch 'nd/ita-empty-commit' | Junio C Hamano | 2016-10-27 | 1 | -4/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: don't be fooled by ita entries when creating initial commit | Nguyễn Thái Ngọc Duy | 2016-10-24 | 1 | -3/+8 |
| * | | | | | | | commit: fix empty commit creation when there's no changes but ita entries | Nguyễn Thái Ngọc Duy | 2016-10-24 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'js/prepare-sequencer' | Junio C Hamano | 2016-10-27 | 2 | -25/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sequencer: get rid of the subcommand field | Johannes Schindelin | 2016-10-21 | 1 | -20/+16 |
| * | | | | | | | | sequencer: plug memory leaks for the option values | Johannes Schindelin | 2016-10-21 | 1 | -0/+4 |