summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4.py: Don't try to rebase on submit from bare repositoryaz/p4-bare-no-rebaseAmadeusz Żołnowski2016-02-191-2/+3
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | for-each-ref: document `creatordate` and `creator` fieldsew/for-each-ref-docEric Wong2016-01-051-2/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ss/user-manual' into maintJunio C Hamano2016-02-052-10/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | user-manual: add addition gitweb informationss/user-manualStephen P. Smith2015-12-301-4/+11
| * | | | | | | | user-manual: add section documenting shallow clonesStephen P. Smith2015-12-301-3/+20
| * | | | | | | | glossary: define the term shallow cloneStephen P. Smith2015-12-291-0/+5
| * | | | | | | | user-manual: remove temporary branch entry from todo listStephen P. Smith2015-12-281-3/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-056-40/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | resolve_gitlink_ref: ignore non-repository pathsjk/ref-cache-non-repository-optimJeff King2016-01-253-14/+43
| * | | | | | | | clean: make is_git_repository a public functionJeff King2016-01-253-26/+37
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'js/dirname-basename' into maintJunio C Hamano2016-02-057-24/+225
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: avoid linking to the C library's isalpha()js/dirname-basenameJohannes Sixt2016-01-252-6/+8
| * | | | | | | | t0060: loosen overly strict expectationsJohannes Schindelin2016-01-151-57/+21
| * | | | | | | | t0060: verify that basename() and dirname() work as expectedJohannes Schindelin2016-01-122-0/+169
| * | | | | | | | compat/basename.c: provide a dirname() compatibility functionJohannes Schindelin2016-01-122-0/+46
| * | | | | | | | compat/basename: make basename() conform to POSIXJohannes Schindelin2016-01-121-3/+17
| * | | | | | | | Refactor skipping DOS drive prefixesJohannes Schindelin2016-01-125-22/+28
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: complete "diff --word-diff-regex="tb/complete-word-diff-regexThomas Braun2016-01-201-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-051-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: update completion arguments for stashPaul Wagland2016-01-261-3/+14
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pw/completion-show-branch' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: complete show-branch "--date-order"pw/completion-show-branchPaul Wagland2016-01-251-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/completion-rebase' into maintJunio C Hamano2016-02-051-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: add missing git-rebase optionsjk/completion-rebaseJohn Keeping2016-01-251-2/+6
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-057-12/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-216-8/+21
| * | | | | | | | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-213-4/+4
| | |_|/ / / / / | |/| | | | | |
View Lorry Controller Status