summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* checkout: restrict @-expansions when finding branchjk/interpret-branch-nameJeff King2017-03-022-1/+11
* strbuf_check_ref_format(): expand only local branchesJeff King2017-03-022-3/+3
* branch: restrict @-expansions when deletingJeff King2017-03-022-4/+7
* t3204: test git-branch @-expansion corner casesJeff King2017-03-021-0/+123
* interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-028-28/+69
* strbuf_branchname: add docstringJeff King2017-03-021-0/+15
* strbuf_branchname: drop return valueJeff King2017-03-022-5/+2
* interpret_branch_name: move docstring to header fileJeff King2017-03-022-21/+21
* interpret_branch_name(): handle auto-namelen for @{-1}Jeff King2017-03-022-1/+10
* Git 2.11.1v2.11.1Junio C Hamano2017-02-021-0/+3
* Merge branch 'ws/request-pull-code-cleanup' into maintJunio C Hamano2017-02-021-3/+0
|\
| * request-pull: drop old USAGE stuffws/request-pull-code-cleanupWolfram Sang2017-01-151-3/+0
* | Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-02-023-21/+35
|\ \
| * | execv_dashed_external: wait for child on signal deathJeff King2017-01-093-0/+21
| * | execv_dashed_external: stop exiting with negative codeJeff King2017-01-091-3/+7
| * | execv_dashed_external: use child_process structJeff King2017-01-091-18/+7
* | | Ready for 2.11.1Junio C Hamano2017-01-311-0/+45
* | | Merge branch 'sb/in-core-index-doc' into maintJunio C Hamano2017-01-313-22/+32
|\ \ \
| * | | documentation: retire unfinished documentationsb/in-core-index-docStefan Beller2017-01-191-21/+0
| * | | cache.h: document add_[file_]to_indexStefan Beller2017-01-191-0/+10
| * | | cache.h: document remove_index_entry_atStefan Beller2017-01-192-1/+3
| * | | cache.h: document index_name_posStefan Beller2017-01-191-0/+19
* | | | Merge branch 'js/mingw-isatty' into maintJunio C Hamano2017-01-311-7/+4
|\ \ \ \
| * | | | mingw: follow-up to "replace isatty() hack"Johannes Schindelin2017-01-181-7/+4
* | | | | Merge branch 'jk/coding-guidelines-update' into maintJunio C Hamano2017-01-311-5/+32
|\ \ \ \ \
| * | | | | CodingGuidelines: clarify multi-line brace stylejk/coding-guidelines-updateJeff King2017-01-171-5/+32
| | |_|/ / | |/| | |
* | | | | Merge branch 'js/exec-path-coverity-workaround' into maintJunio C Hamano2017-01-311-6/+8
|\ \ \ \ \
| * | | | | git_exec_path: do not return the result of getenv()js/exec-path-coverity-workaroundJeff King2017-01-091-9/+8
| * | | | | git_exec_path: avoid Coverity warning about unfree()d resultJohannes Schindelin2017-01-081-1/+4
* | | | | | Merge branch 'ad/bisect-terms' into maintJunio C Hamano2017-01-311-2/+2
|\ \ \ \ \ \
| * | | | | | Documentation/bisect: improve on (bad|new) and (good|bad)ad/bisect-termsChristian Couder2017-01-131-2/+2
* | | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maintJunio C Hamano2017-01-311-11/+15
|\ \ \ \ \ \ \
| * | | | | | | t7810: avoid assumption about invalid regex syntaxjk/grep-e-could-be-extended-beyond-posixJeff King2017-01-111-11/+15
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2017-01-312-3/+9
|\ \ \ \ \ \ \
| * | | | | | | branch_get_push: do not segfault when HEAD is detachedkm/branch-get-push-while-detachedKyle Meyer2017-01-072-3/+9
| |/ / / / / /
* | | | | | | Merge branch 'jk/rebase-i-squash-count-fix' into maintJunio C Hamano2017-01-311-1/+1
|\ \ \ \ \ \ \
| * | | | | | | rebase--interactive: count squash commits above 10 correctlyjk/rebase-i-squash-count-fixJeff King2017-01-071-1/+1
* | | | | | | | Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-313-10/+166
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-072-9/+131
| * | | | | | | | blame: handle --no-abbrevJeff King2017-01-072-0/+6
| * | | | | | | | blame: fix alignment with --abbrev=40Jeff King2017-01-072-1/+29
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/archive-zip-userdiff-config' into maintJunio C Hamano2017-01-312-4/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | archive-zip: load userdiff configjk/archive-zip-userdiff-configJeff King2017-01-072-4/+25
| |/ / / / / / /
* | | | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-314-6/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gcDavid Turner2016-12-292-5/+12
| * | | | | | | | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-292-1/+33
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano2017-01-311-5/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | config.c: handle lock file in error case in git_config_rename_...nd/config-misc-fixesNguyễn Thái Ngọc Duy2016-12-221-1/+3
| * | | | | | | | config.c: rename label unlock_and_outNguyễn Thái Ngọc Duy2016-12-201-2/+2
| * | | | | | | | config.c: handle error case for fstat() callsNguyễn Thái Ngọc Duy2016-12-201-2/+10