Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'jk/more-comments-on-textconv' into maint | Junio C Hamano | 2016-03-10 | 3 | -1/+24 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | diff: clarify textconv interfacejk/more-comments-on-textconv | Jeff King | 2016-02-22 | 3 | -1/+24 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'jk/no-diff-emit-common' into maint | Junio C Hamano | 2016-03-10 | 4 | -57/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-common | Jeff King | 2016-02-22 | 2 | -19/+0 | |
| * | | | | | | | merge-tree: drop generate_common strategy | Jeff King | 2016-02-22 | 1 | -36/+2 | |
| * | | | | | | | merge-one-file: use empty blob for add/add base | Jeff King | 2016-02-22 | 1 | -2/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'jc/am-i-v-fix' into maint | Junio C Hamano | 2016-03-10 | 3 | -9/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | am -i: fix "v"iewjc/am-i-v-fix | Junio C Hamano | 2016-02-17 | 1 | -1/+1 | |
| * | | | | | | | pager: factor out a helper to prepare a child process to run the pager | Junio C Hamano | 2016-02-17 | 2 | -6/+14 | |
| * | | | | | | | pager: lose a separate argv[] | Junio C Hamano | 2016-02-16 | 1 | -3/+1 | |
* | | | | | | | | Merge branch 'nd/git-common-dir-fix' into maint | Junio C Hamano | 2016-03-10 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fix | Nguyễn Thái Ngọc Duy | 2016-02-12 | 2 | -1/+12 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint | Junio C Hamano | 2016-03-10 | 5 | -33/+54 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | get_sha1: don't die() on bogus search stringsnd/dwim-wildcards-as-pathspecs | Jeff King | 2016-02-10 | 2 | -2/+12 | |
| * | | | | | | | | check_filename: tighten dwim-wildcard ambiguity | Jeff King | 2016-02-10 | 4 | -31/+42 | |
| * | | | | | | | | checkout: reorder check_filename conditional | Jeff King | 2016-02-10 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'jk/epipe-in-async' into maint | Junio C Hamano | 2016-03-10 | 6 | -3/+25 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | t5504: handle expected output from SIGPIPE deathjk/epipe-in-async | Jeff King | 2016-02-25 | 1 | -1/+4 | |
| * | | | | | | | | | test_must_fail: report number of unexpected signal | Jeff King | 2016-02-25 | 1 | -1/+1 | |
| * | | | | | | | | | fetch-pack: ignore SIGPIPE in sideband demuxer | Jeff King | 2016-02-25 | 1 | -1/+5 | |
| * | | | | | | | | | write_or_die: handle EPIPE in async threads | Jeff King | 2016-02-25 | 3 | -0/+15 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ps/config-error' into maint | Junio C Hamano | 2016-03-10 | 13 | -105/+159 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | config: rename git_config_set_or_die to git_config_setps/config-error | Patrick Steinhardt | 2016-02-22 | 10 | -67/+67 | |
| * | | | | | | | | | config: rename git_config_set to git_config_set_gently | Patrick Steinhardt | 2016-02-22 | 7 | -39/+40 | |
| * | | | | | | | | | compat: die when unable to set core.precomposeunicode | Patrick Steinhardt | 2016-02-22 | 1 | -1/+2 | |
| * | | | | | | | | | sequencer: die on config error when saving replay opts | Patrick Steinhardt | 2016-02-22 | 1 | -11/+11 | |
| * | | | | | | | | | init-db: die on config errors when initializing empty repo | Patrick Steinhardt | 2016-02-22 | 1 | -10/+10 | |
| * | | | | | | | | | clone: die on config error in cmd_clone | Patrick Steinhardt | 2016-02-22 | 1 | -4/+4 | |
| * | | | | | | | | | remote: die on config error when manipulating remotes | Patrick Steinhardt | 2016-02-22 | 1 | -27/+12 | |
| * | | | | | | | | | remote: die on config error when setting/adding branches | Patrick Steinhardt | 2016-02-22 | 1 | -17/+9 | |
| * | | | | | | | | | remote: die on config error when setting URL | Patrick Steinhardt | 2016-02-22 | 2 | -5/+15 | |
| * | | | | | | | | | submodule--helper: die on config error when cloning module | Patrick Steinhardt | 2016-02-22 | 1 | -2/+2 | |
| * | | | | | | | | | submodule: die on config error when linking modules | Patrick Steinhardt | 2016-02-22 | 1 | -5/+3 | |
| * | | | | | | | | | branch: die on config error when editing branch description | Patrick Steinhardt | 2016-02-22 | 1 | -3/+2 | |
| * | | | | | | | | | branch: die on config error when unsetting upstream | Patrick Steinhardt | 2016-02-22 | 2 | -2/+9 | |
| * | | | | | | | | | branch: report errors in tracking branch setup | Patrick Steinhardt | 2016-02-22 | 3 | -16/+46 | |
| * | | | | | | | | | config: introduce set_or_die wrappers | Patrick Steinhardt | 2016-02-16 | 2 | -0/+31 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'mg/work-tree-tests' into maint | Junio C Hamano | 2016-03-10 | 3 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | tests: rename work-tree tests to *work-tree*mg/work-tree-tests | Michael J Gruber | 2016-02-20 | 3 | -0/+0 | |
* | | | | | | | | | | Merge branch 'sp/remote-curl-ssl-strerror' into maint | Junio C Hamano | 2016-03-10 | 1 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | remote-curl: include curl_errorstr on SSL setup failuressp/remote-curl-ssl-strerror | Shawn Pearce | 2016-02-15 | 1 | -2/+14 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Git 2.7.2v2.7.2 | Junio C Hamano | 2016-02-22 | 3 | -2/+17 | |
* | | | | | | | | | Merge branch 'nd/ita-cleanup' into maint | Junio C Hamano | 2016-02-22 | 6 | -10/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | grep: make it clear i-t-a entries are ignored | Nguyễn Thái Ngọc Duy | 2015-12-28 | 1 | -1/+1 | |
| * | | | | | | | | | add and use a convenience macro ce_intent_to_add() | Nguyễn Thái Ngọc Duy | 2015-09-06 | 4 | -4/+5 | |
| * | | | | | | | | | blame: remove obsolete comment | Nguyễn Thái Ngọc Duy | 2015-08-25 | 1 | -5/+0 | |
* | | | | | | | | | | Merge branch 'pw/completion-stash' into maint | Junio C Hamano | 2016-02-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | completion: fix mis-indentation in _git_stash()pw/completion-stash | SZEDER Gábor | 2016-02-22 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'mm/clean-doc-fix' into maint | Junio C Hamano | 2016-02-22 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Documentation/git-clean.txt: don't mention deletion of .git/modules/*mm/clean-doc-fix | Matt McCutchen | 2016-02-09 | 1 | -3/+1 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | |