aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* filter-branch: eliminate duplicate mapped parentsCharles Bailey2014-07-01
* Git 2.0.1v2.0.1Junio C Hamano2014-06-25
* Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-25
|\
| * t5538: move http push tests out to t5542Nick Alcock2014-05-30
* | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-25
|\ \
| * | commit -m: commit staged submodules regardless of ignore configJens Lehmann2014-04-07
| * | status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-07
* | | Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-25
|\ \ \
| * | | read-cache.c: verify index file before we opportunistically update itYiannis Marangos2014-04-10
| * | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-10
* | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-25
|\ \ \ \
| * | | | git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov2014-05-15
| |/ / /
* | | | Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-25
|\ \ \ \
| * | | | rebase -i: test "Nothing to do" case with autostashMatthieu Moy2014-05-20
| * | | | rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-19
* | | | | Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-25
|\ \ \ \ \
| * | | | | shortlog: allow --exclude=<glob> to be passedJunio C Hamano2014-06-04
* | | | | | Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \
| * | | | | | remote prune: optimize "dangling symref" check/warningJens Lindström2014-05-27
| * | | | | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-27
| * | | | | | remote rm: delete remote configuration as the lastJens Lindström2014-05-23
* | | | | | | Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \
| * | | | | | | rerere: fix for merge.conflictstyleFelipe Contreras2014-04-30
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: use free()+xcalloc() instead of xrealloc()+memset()René Scharfe2014-06-02
* | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \
| * | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsDavid Turner2014-05-08
| * | | | | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-07
* | | | | | | | | Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailinfo: use strcmp() for string comparisonRené Scharfe2014-06-02
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: distinguish missing objects from type errorsJeff King2014-05-12
* | | | | | | | | | Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | index-pack: work around thread-unsafe pread()Nguyễn Thái Ngọc Duy2014-04-16
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionJohannes Schindelin2014-05-15
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/daemonize-gc' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc --auto: do not lock refs in the backgroundNguyễn Thái Ngọc Duy2014-05-27
* | | | | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_doneJeff King2014-05-20
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | run_diff_files: do not look at uninitialized stat dataJeff King2014-05-15
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: do not complain of empty messages from -CJeff King2014-04-28
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: correctly handle files regardless of autocrlfbrian m. carlson2014-05-08
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: dynamic blame_date_width for different localesJiang Xin2014-04-23
| * | | | | | | | | | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-23
* | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \