summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-052-33/+44
* rebase-i: explicitly accept tab as separator in commandsMatthieu Moy2015-10-021-2/+2
* git rebase -i: add static check for commands and SHA-1Galan Rémi2015-06-303-0/+116
* git rebase -i: warn about removed commitsGalan Rémi2015-06-304-3/+197
* git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-304-3/+25
* Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-271-2/+6
|\
| * t7063: hide stderr from setup inside prereqJeff King2015-05-271-2/+6
* | Sync with 2.4.2Junio C Hamano2015-05-262-1/+47
|\ \
| * | Git 2.4.2v2.4.2Junio C Hamano2015-05-264-3/+49
| * | Merge branch 'jk/still-interesting' into maintJunio C Hamano2015-05-261-4/+19
| |\ \
| * \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-265-9/+43
| |\ \ \
| * \ \ \ Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano2015-05-261-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano2015-05-261-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-262-1/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintJunio C Hamano2015-05-261-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-262-7/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/git-no-more-argv0-path-munging' into maintJunio C Hamano2015-05-261-1/+0
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | Fifth batch for 2.5 cycleJunio C Hamano2015-05-261-6/+28
* | | | | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-2621-58/+1822
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | git-status.txt: advertisement for untracked cacheNguyễn Thái Ngọc Duy2015-03-121-1/+4
| * | | | | | | | | | untracked cache: guard and disable on system changesNguyễn Thái Ngọc Duy2015-03-126-7/+72
| * | | | | | | | | | mingw32: add uname()Nguyễn Thái Ngọc Duy2015-03-122-0/+20
| * | | | | | | | | | t7063: tests for untracked cacheNguyễn Thái Ngọc Duy2015-03-124-0/+416
| * | | | | | | | | | update-index: test the system before enabling untracked cacheNguyễn Thái Ngọc Duy2015-03-122-0/+174
| * | | | | | | | | | update-index: manually enable or disable untracked cacheNguyễn Thái Ngọc Duy2015-03-122-0/+24
| * | | | | | | | | | status: enable untracked cacheNguyễn Thái Ngọc Duy2015-03-122-2/+5
| * | | | | | | | | | untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHENguyễn Thái Ngọc Duy2015-03-121-1/+1
| * | | | | | | | | | untracked cache: mark index dirty if untracked cache is updatedNguyễn Thái Ngọc Duy2015-03-123-1/+11
| * | | | | | | | | | untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATSNguyễn Thái Ngọc Duy2015-03-121-0/+12
| * | | | | | | | | | untracked cache: avoid racy timestampsNguyễn Thái Ngọc Duy2015-03-123-2/+12
| * | | | | | | | | | read-cache.c: split racy stat test to a separate functionNguyễn Thái Ngọc Duy2015-03-121-9/+15
| * | | | | | | | | | untracked cache: invalidate at index addition or removalNguyễn Thái Ngọc Duy2015-03-124-2/+44
| * | | | | | | | | | untracked cache: load from UNTR index extensionNguyễn Thái Ngọc Duy2015-03-123-0/+226
| * | | | | | | | | | untracked cache: save to an index extensionNguyễn Thái Ngọc Duy2015-03-125-0/+213
| * | | | | | | | | | ewah: add convenient wrapper ewah_serialize_strbuf()Nguyễn Thái Ngọc Duy2015-03-123-9/+17
| * | | | | | | | | | untracked cache: don't open non-existent .gitignoreNguyễn Thái Ngọc Duy2015-03-121-1/+25
| * | | | | | | | | | untracked cache: mark what dirs should be recursed/savedNguyễn Thái Ngọc Duy2015-03-122-2/+15
| * | | | | | | | | | untracked cache: record/validate dir mtime and reuse cached outputNguyễn Thái Ngọc Duy2015-03-122-2/+121
| * | | | | | | | | | untracked cache: make a wrapper around {open,read,close}dir()Nguyễn Thái Ngọc Duy2015-03-121-8/+47
| * | | | | | | | | | untracked cache: invalidate dirs recursively if .gitignore changesNguyễn Thái Ngọc Duy2015-03-121-1/+17
| * | | | | | | | | | untracked cache: initial untracked cache validationNguyễn Thái Ngọc Duy2015-03-122-3/+114
| * | | | | | | | | | untracked cache: record .gitignore information and dir hierarchyNguyễn Thái Ngọc Duy2015-03-122-19/+183
| * | | | | | | | | | dir.c: optionally compute sha-1 of a .gitignore fileNguyễn Thái Ngọc Duy2015-03-122-7/+53
* | | | | | | | | | | Merge branch 'rs/plug-leak-in-pack-bitmaps'Junio C Hamano2015-05-261-5/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsrs/plug-leak-in-pack-bitmapsRené Scharfe2015-05-191-5/+3
* | | | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-263-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pull: parse pull.ff as a bool or stringpt/pull-ff-vs-merge-ffPaul Tan2015-05-181-1/+1
| * | | | | | | | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-183-1/+12
* | | | | | | | | | | | | Merge branch 'pt/pull-log-n'Junio C Hamano2015-05-262-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \