Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-report | Michael Haggerty | 2015-05-27 | 2 | -9/+9 |
* | verify_lock(): do not capitalize error messages | Michael Haggerty | 2015-05-27 | 1 | -2/+2 |
* | verify_lock(): report errors via a strbuf | Michael Haggerty | 2015-05-27 | 1 | -7/+12 |
* | verify_lock(): on errors, let the caller unlock the lock | Michael Haggerty | 2015-05-27 | 1 | -4/+4 |
* | verify_lock(): return 0/-1 rather than struct ref_lock * | Michael Haggerty | 2015-05-27 | 1 | -7/+14 |
* | Sync with 2.4.2 | Junio C Hamano | 2015-05-26 | 2 | -1/+47 |
|\ | |||||
| * | Git 2.4.2v2.4.2 | Junio C Hamano | 2015-05-26 | 4 | -3/+49 |
| * | Merge branch 'jk/still-interesting' into maint | Junio C Hamano | 2015-05-26 | 1 | -4/+19 |
| |\ | |||||
| * \ | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 | 5 | -9/+43 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/rebase-quiet-noop' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'sg/complete-decorate-full-not-long' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-05-26 | 2 | -1/+19 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-05-26 | 2 | -7/+16 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/git-no-more-argv0-path-munging' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | Fifth batch for 2.5 cycle | Junio C Hamano | 2015-05-26 | 1 | -6/+28 |
* | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-26 | 21 | -58/+1822 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-status.txt: advertisement for untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -1/+4 |
| * | | | | | | | | | | untracked cache: guard and disable on system changes | Nguyễn Thái Ngọc Duy | 2015-03-12 | 6 | -7/+72 |
| * | | | | | | | | | | mingw32: add uname() | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -0/+20 |
| * | | | | | | | | | | t7063: tests for untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 4 | -0/+416 |
| * | | | | | | | | | | update-index: test the system before enabling untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -0/+174 |
| * | | | | | | | | | | update-index: manually enable or disable untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -0/+24 |
| * | | | | | | | | | | status: enable untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -2/+5 |
| * | | | | | | | | | | untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -1/+1 |
| * | | | | | | | | | | untracked cache: mark index dirty if untracked cache is updated | Nguyễn Thái Ngọc Duy | 2015-03-12 | 3 | -1/+11 |
| * | | | | | | | | | | untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+12 |
| * | | | | | | | | | | untracked cache: avoid racy timestamps | Nguyễn Thái Ngọc Duy | 2015-03-12 | 3 | -2/+12 |
| * | | | | | | | | | | read-cache.c: split racy stat test to a separate function | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -9/+15 |
| * | | | | | | | | | | untracked cache: invalidate at index addition or removal | Nguyễn Thái Ngọc Duy | 2015-03-12 | 4 | -2/+44 |
| * | | | | | | | | | | untracked cache: load from UNTR index extension | Nguyễn Thái Ngọc Duy | 2015-03-12 | 3 | -0/+226 |
| * | | | | | | | | | | untracked cache: save to an index extension | Nguyễn Thái Ngọc Duy | 2015-03-12 | 5 | -0/+213 |
| * | | | | | | | | | | ewah: add convenient wrapper ewah_serialize_strbuf() | Nguyễn Thái Ngọc Duy | 2015-03-12 | 3 | -9/+17 |
| * | | | | | | | | | | untracked cache: don't open non-existent .gitignore | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -1/+25 |
| * | | | | | | | | | | untracked cache: mark what dirs should be recursed/saved | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -2/+15 |
| * | | | | | | | | | | untracked cache: record/validate dir mtime and reuse cached output | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -2/+121 |
| * | | | | | | | | | | untracked cache: make a wrapper around {open,read,close}dir() | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -8/+47 |
| * | | | | | | | | | | untracked cache: invalidate dirs recursively if .gitignore changes | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -1/+17 |
| * | | | | | | | | | | untracked cache: initial untracked cache validation | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -3/+114 |
| * | | | | | | | | | | untracked cache: record .gitignore information and dir hierarchy | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -19/+183 |
| * | | | | | | | | | | dir.c: optionally compute sha-1 of a .gitignore file | Nguyễn Thái Ngọc Duy | 2015-03-12 | 2 | -7/+53 |
* | | | | | | | | | | | Merge branch 'rs/plug-leak-in-pack-bitmaps' | Junio C Hamano | 2015-05-26 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsrs/plug-leak-in-pack-bitmaps | René Scharfe | 2015-05-19 | 1 | -5/+3 |
* | | | | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' | Junio C Hamano | 2015-05-26 | 3 | -2/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pull: parse pull.ff as a bool or stringpt/pull-ff-vs-merge-ff | Paul Tan | 2015-05-18 | 1 | -1/+1 |
| * | | | | | | | | | | | | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 | 3 | -1/+12 |
* | | | | | | | | | | | | | Merge branch 'pt/pull-log-n' | Junio C Hamano | 2015-05-26 | 2 | -2/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | pull: handle --log=<n>pt/pull-log-n | Paul Tan | 2015-05-18 | 2 | -2/+19 |
* | | | | | | | | | | | | | | Merge branch 'jk/rerere-forget-check-enabled' | Junio C Hamano | 2015-05-26 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rerere: exit silently on "forget" when rerere is disabledjk/rerere-forget-check-enabled | Jeff King | 2015-05-14 | 1 | -0/+2 |