summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dw/mergetool-vim-window-shuffle' into maintJunio C Hamano2016-02-221-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetool: reorder vim/gvim buffers in three-way diffsdw/mergetool-vim-window-shuffleDickson Wong2016-02-121-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stripspace: call U+0020 a "space" instead of a "blank"ah/stripspace-optstringAlex Henrie2016-01-291-1/+1
| |/ / / / / / / /
* | | | | | | | | Start preparing for 2.7.2Junio C Hamano2016-02-172-1/+28
* | | | | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maintJunio C Hamano2016-02-171-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: limit the output of the yes utilityjs/test-lib-windows-emulated-yesJohannes Schindelin2016-02-021-2/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'aw/push-force-with-lease-reporting' into maintJunio C Hamano2016-02-172-12/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: fix ref status reporting for --force-with-leaseaw/push-force-with-lease-reportingAndrew Wheeler2016-02-012-12/+18
* | | | | | | | | | Merge branch 'nd/do-not-move-worktree-manually' into maintJunio C Hamano2016-02-173-21/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | worktree: stop supporting moving worktrees manuallynd/do-not-move-worktree-manuallyNguyễn Thái Ngọc Duy2016-01-222-17/+10
| * | | | | | | | | | worktree.c: fix indentationNguyễn Thái Ngọc Duy2016-01-191-4/+4
* | | | | | | | | | | Merge branch 'js/xmerge-marker-eol' into maintJunio C Hamano2016-02-172-18/+93
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eolJohannes Schindelin2016-01-272-15/+25
| * | | | | | | | | | | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-272-4/+69
* | | | | | | | | | | | git-cvsserver.perl: fix typoGyuYong Jung2016-02-171-1/+1
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Git 2.7.1v2.7.1Junio C Hamano2016-02-054-3/+91
* | | | | | | | | | | Merge branch 'lv/add-doc-working-tree' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-add doc: do not say working directory when you mean working treelv/add-doc-working-treeLars Vogel2016-01-211-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ss/clone-depth-single-doc' into maintJunio C Hamano2016-02-052-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs: clarify that --depth for git-fetch works with newly initialized reposss/clone-depth-single-docSebastian Schuberth2016-01-081-4/+5
| * | | | | | | | | | | docs: say "commits" in the --depth option wording for git-cloneSebastian Schuberth2016-01-081-1/+1
| * | | | | | | | | | | docs: clarify that passing --depth to git-clone implies --single-branchSebastian Schuberth2016-01-071-5/+4
* | | | | | | | | | | | Merge branch 'sg/t6050-failing-editor-test-fix' into maintJunio C Hamano2016-02-051-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t6050-replace: make failing editor test more robustsg/t6050-failing-editor-test-fixSZEDER Gábor2016-01-051-3/+7
* | | | | | | | | | | | | Merge branch 'ew/for-each-ref-doc' into maintJunio C Hamano2016-02-051-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \