summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'jk/more-comments-on-textconv' into maintJunio C Hamano2016-03-103-1/+24
|\ \ \ \ \ \ \
| * | | | | | | diff: clarify textconv interfacejk/more-comments-on-textconvJeff King2016-02-223-1/+24
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/no-diff-emit-common' into maintJunio C Hamano2016-03-104-57/+3
|\ \ \ \ \ \ \
| * | | | | | | xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-commonJeff King2016-02-222-19/+0
| * | | | | | | merge-tree: drop generate_common strategyJeff King2016-02-221-36/+2
| * | | | | | | merge-one-file: use empty blob for add/add baseJeff King2016-02-221-2/+1
| |/ / / / / /
* | | | | | | Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-103-9/+15
|\ \ \ \ \ \ \
| * | | | | | | am -i: fix "v"iewjc/am-i-v-fixJunio C Hamano2016-02-171-1/+1
| * | | | | | | pager: factor out a helper to prepare a child process to run the pagerJunio C Hamano2016-02-172-6/+14
| * | | | | | | pager: lose a separate argv[]Junio C Hamano2016-02-161-3/+1
* | | | | | | | Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-102-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fixNguyễn Thái Ngọc Duy2016-02-122-1/+12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-105-33/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | get_sha1: don't die() on bogus search stringsnd/dwim-wildcards-as-pathspecsJeff King2016-02-102-2/+12
| * | | | | | | | check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-104-31/+42
| * | | | | | | | checkout: reorder check_filename conditionalJeff King2016-02-101-1/+1
* | | | | | | | | Merge branch 'jk/epipe-in-async' into maintJunio C Hamano2016-03-106-3/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5504: handle expected output from SIGPIPE deathjk/epipe-in-asyncJeff King2016-02-251-1/+4
| * | | | | | | | | test_must_fail: report number of unexpected signalJeff King2016-02-251-1/+1
| * | | | | | | | | fetch-pack: ignore SIGPIPE in sideband demuxerJeff King2016-02-251-1/+5
| * | | | | | | | | write_or_die: handle EPIPE in async threadsJeff King2016-02-253-0/+15
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-1013-105/+159
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: rename git_config_set_or_die to git_config_setps/config-errorPatrick Steinhardt2016-02-2210-67/+67
| * | | | | | | | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-227-39/+40
| * | | | | | | | | compat: die when unable to set core.precomposeunicodePatrick Steinhardt2016-02-221-1/+2
| * | | | | | | | | sequencer: die on config error when saving replay optsPatrick Steinhardt2016-02-221-11/+11
| * | | | | | | | | init-db: die on config errors when initializing empty repoPatrick Steinhardt2016-02-221-10/+10
| * | | | | | | | | clone: die on config error in cmd_clonePatrick Steinhardt2016-02-221-4/+4
| * | | | | | | | | remote: die on config error when manipulating remotesPatrick Steinhardt2016-02-221-27/+12
| * | | | | | | | | remote: die on config error when setting/adding branchesPatrick Steinhardt2016-02-221-17/+9
| * | | | | | | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-222-5/+15
| * | | | | | | | | submodule--helper: die on config error when cloning modulePatrick Steinhardt2016-02-221-2/+2
| * | | | | | | | | submodule: die on config error when linking modulesPatrick Steinhardt2016-02-221-5/+3
| * | | | | | | | | branch: die on config error when editing branch descriptionPatrick Steinhardt2016-02-221-3/+2
| * | | | | | | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-222-2/+9
| * | | | | | | | | branch: report errors in tracking branch setupPatrick Steinhardt2016-02-223-16/+46
| * | | | | | | | | config: introduce set_or_die wrappersPatrick Steinhardt2016-02-162-0/+31
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mg/work-tree-tests' into maintJunio C Hamano2016-03-103-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: rename work-tree tests to *work-tree*mg/work-tree-testsMichael J Gruber2016-02-203-0/+0
* | | | | | | | | | Merge branch 'sp/remote-curl-ssl-strerror' into maintJunio C Hamano2016-03-101-2/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | remote-curl: include curl_errorstr on SSL setup failuressp/remote-curl-ssl-strerrorShawn Pearce2016-02-151-2/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Git 2.7.2v2.7.2Junio C Hamano2016-02-223-2/+17
* | | | | | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-226-10/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: make it clear i-t-a entries are ignoredNguyễn Thái Ngọc Duy2015-12-281-1/+1
| * | | | | | | | | add and use a convenience macro ce_intent_to_add()Nguyễn Thái Ngọc Duy2015-09-064-4/+5
| * | | | | | | | | blame: remove obsolete commentNguyễn Thái Ngọc Duy2015-08-251-5/+0
* | | | | | | | | | Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-221-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: fix mis-indentation in _git_stash()pw/completion-stashSZEDER Gábor2016-02-221-2/+2
* | | | | | | | | | | Merge branch 'mm/clean-doc-fix' into maintJunio C Hamano2016-02-221-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/git-clean.txt: don't mention deletion of .git/modules/*mm/clean-doc-fixMatt McCutchen2016-02-091-3/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |