aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* worktree.c: avoid referencing to worktrees[i] multiple timesNguyễn Thái Ngọc Duy2016-04-22
* wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy2016-04-22
* wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-22
* path.c: refactor and add worktree_git_path()Nguyễn Thái Ngọc Duy2016-04-22
* worktree.c: mark current worktreeNguyễn Thái Ngọc Duy2016-04-22
* worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-22
* worktree.c: store "id" instead of "git_dir"Nguyễn Thái Ngọc Duy2016-04-22
* path.c: add git_common_path() and strbuf_git_common_path()Nguyễn Thái Ngọc Duy2016-04-22
* dir.c: rename str(n)cmp_icase to fspath(n)cmpNguyễn Thái Ngọc Duy2016-04-22
* Fifth batch for post 2.8 cycleJunio C Hamano2016-04-18
* Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-18
|\
| * branch: fix shortening of non-remote symrefsJeff King2016-04-04
* | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-18
|\ \
| * | set_worktree_head_symref(): fix error messageKazuki Yamaguchi2016-04-08
| * | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-04
| * | refs: add a new function set_worktree_head_symrefKazuki Yamaguchi2016-04-04
* | | Merge branch 'maint'Junio C Hamano2016-04-14
|\ \ \
| * | | Prepare for 2.8.2Junio C Hamano2016-04-14
| * | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-14
| |\ \ \
| * \ \ \ Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-14
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/send-email-rtrim-mailrc-alias' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/credential-cache-comment-exit' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mp/upload-pack-use-embedded-args' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'oa/doc-diff-check' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/apply-doc' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/lockfile-error-message' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Start preparing for 2.8.2Junio C Hamano2016-04-13
* | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for post 2.8 cycleJunio C Hamano2016-04-13
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/complete-cherry-mark-to-log'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | completion: complete --cherry-mark for git logMichael J Gruber2016-04-05
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: fix typoElia Pinto2016-04-05
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: fix misdirected redirectionsJunio C Hamano2016-04-05
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /