aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'rs/janitorial'Junio C Hamano2015-06-01
|\
| * dir: remove unused variable sbRené Scharfe2015-05-20
| * clean: remove unused variable bufRené Scharfe2015-05-20
| * use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-20
* | Merge branch 'jk/stash-options'Junio C Hamano2015-06-01
|\ \
| * | stash: recognize "--help" for subcommandsJeff King2015-05-20
| * | stash: complain about unknown flagsJeff King2015-05-20
* | | Merge branch 'da/mergetool-winmerge'Junio C Hamano2015-06-01
|\ \ \
| * | | mergetools: add winmerge as a builtin toolDavid Aguilar2015-05-20
| * | | mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar2015-05-20
* | | | Merge branch 'mc/commit-doc-grammofix'Junio C Hamano2015-06-01
|\ \ \ \
| * | | | Documentation/git-commit: grammofixMichael Coleman2015-05-19
* | | | | Merge branch 'jh/filter-empty-contents'Junio C Hamano2015-06-01
|\ \ \ \ \
| * | | | | sha1_file: pass empty buffer to index empty fileJim Hill2015-05-18
* | | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-06-01
|\ \ \ \ \ \
| * | | | | | blame, log: format usage strings similarly to those in documentationAlex Henrie2015-05-03
* | | | | | | Merge branch 'jk/http-backend-deadlock'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockJunio C Hamano2015-05-25
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3Junio C Hamano2015-05-25
| | |\ \ \ \ \ \
| | | * | | | | | http-backend: spool ref negotiation requests to bufferJeff King2015-05-25
| | | * | | | | | t5551: factor out tag creationJeff King2015-05-20
| | | * | | | | | http-backend: fix die recursion with custom handlerJeff King2015-05-15
| | | | |_|_|/ / | | | |/| | | |
* | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \
| * | | | | | | | clean: only lstat files in pathspecDavid Turner2015-05-18
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-27
|\ \ \ \ \ \ \ \
| * | | | | | | | t7063: hide stderr from setup inside prereqJeff King2015-05-27
* | | | | | | | | Sync with 2.4.2Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Git 2.4.2v2.4.2Junio C Hamano2015-05-26
| * | | | | | | | | Merge branch 'jk/still-interesting' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-no-more-argv0-path-munging' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fifth batch for 2.5 cycleJunio C Hamano2015-05-26
* | | | | | | | | | | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | git-status.txt: advertisement for untracked cacheNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | untracked cache: guard and disable on system changesNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | mingw32: add uname()Nguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | t7063: tests for untracked cacheNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | update-index: test the system before enabling untracked cacheNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | update-index: manually enable or disable untracked cacheNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | status: enable untracked cacheNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHENguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | untracked cache: mark index dirty if untracked cache is updatedNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATSNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | untracked cache: avoid racy timestampsNguyễn Thái Ngọc Duy2015-03-12
| * | | | | | | | | | | | | | | | read-cache.c: split racy stat test to a separate functionNguyễn Thái Ngọc Duy2015-03-12