aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-08
|\
| * parse-options: make sure argh string does not have SP or _Junio C Hamano2014-03-24
| * update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano2014-03-24
| * parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-24
* | Merge branch 'jk/commit-dates-parsing-fix'Junio C Hamano2014-04-08
|\ \
| * | t4212: loosen far-in-future test for AIXJeff King2014-04-01
| * | date: recognize bogus FreeBSD gmtime outputJeff King2014-04-01
* | | git-p4: explicitly specify that HEAD is a revisionVlad Dogaru2014-04-07
* | | MSVC: allow using ExtUtils::MakeMakerMarat Radchenko2014-04-04
* | | Update draft release notes to 2.0Junio C Hamano2014-04-03
* | | Merge branch 'maint'Junio C Hamano2014-04-03
|\ \ \
| * | | Start preparing for 1.9.1Junio C Hamano2014-04-03
| * | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-03
| |\ \ \
| * \ \ \ Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano2014-04-03
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/gc-aggressive'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | environment.c: fix constness for odb_pack_keep()Nguyễn Thái Ngọc Duy2014-03-31
| * | | | | | | | | | | | | gc --aggressive: make --depth configurableNguyễn Thái Ngọc Duy2014-03-31
* | | | | | | | | | | | | | Merge branch 'jc/fix-diff-no-index-diff-opt-parse'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff-no-index: correctly diagnose error return from diff_opt_parse()Junio C Hamano2014-03-31
* | | | | | | | | | | | | | | Merge branch 'cb/aix'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tests: don't rely on strerror text when testing rmdir failureCharles Bailey2014-03-31
| * | | | | | | | | | | | | | | dir.c: make git_fnmatch() not inlineCharles Bailey2014-03-31
* | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune-overlapping-destination'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fetch: handle overlaping refspecs on --pruneCarlos Martín Nieto2014-03-26
| * | | | | | | | | | | | | | | | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-28
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | log: add --show-linear-break to help see non-linear historyNguyễn Thái Ngọc Duy2014-03-25
| * | | | | | | | | | | | | | | | object.h: centralize object flag allocationNguyễn Thái Ngọc Duy2014-03-25
* | | | | | | | | | | | | | | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-am.sh: use the $(...) construct for command substitutionElia Pinto2014-03-25
| * | | | | | | | | | | | | | | | | check-builtins.sh: use the $(...) construct for command substitutionElia Pinto2014-03-25
* | | | | | | | | | | | | | | | | | Merge branch 'ap/remote-hg-skip-null-bookmarks'Junio C Hamano2014-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | remote-hg: do not fail on invalid bookmarksMax Horn2014-03-25
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe-i'Junio C Hamano2014-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | pickaxe: simplify kwset loop in contains()René Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | pickaxe: call strlen only when necessary in diffcore_pickaxe_count()René Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | pickaxe: move pickaxe() after pickaxe_match()René Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diff...René Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | pickaxe: honor -i when used with -S and --pickaxe-regexRené Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | t4209: use helper functions to test --authorRené Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | t4209: use helper functions to test --grepRené Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | t4209: factor out helper function test_log_icase()René Scharfe2014-03-24
| * | | | | | | | | | | | | | | | | | | t4209: factor out helper function test_log()René Scharfe2014-03-24