Commit message (Expand) | Author | Age | |
---|---|---|---|
* | combine-diff: handle binary files as binary | Jeff King | 2011-05-23 |
* | Merge branch 'maint' | Junio C Hamano | 2011-05-20 |
|\ | |||
| * | git-svn: Fix git svn log --show-commit | Michael J Gruber | 2011-05-20 |
| * | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint | Junio C Hamano | 2011-05-16 |
| |\ | |||
| * \ | Merge branch 'jc/fix-add-u-unmerged' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ | |||
| * \ \ | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'jl/submodule-conflicted-gitmodules' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ \ \ | |||
| * | | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflicts | Jens Lehmann | 2011-05-14 |
| * | | | | | | test that git status works with merge conflict in, .gitmodules | Heiko Voigt | 2011-05-14 |
* | | | | | | | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t6050: make sure we test not just commit replacement | Junio C Hamano | 2011-05-15 |
* | | | | | | | | Merge branch 'nd/sparse-co-fix' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | sparse checkout: do not eagerly decide the fate for whole directory | Nguyễn Thái Ngọc Duy | 2011-05-10 |
| * | | | | | | | | t1011: fix sparse-checkout initialization and add new file | Nguyễn Thái Ngọc Duy | 2011-05-10 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'ld/p4-preserve-user-names' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-p4: warn if git authorship won't be retained | Luke Diamand | 2011-05-13 |
| * | | | | | | | | git-p4: add option to preserve user names | Luke Diamand | 2011-04-26 |
* | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | test core.gitproxy configuration | Jeff King | 2011-05-18 |
* | | | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t3503: test cherry picking and reverting root commits | Jeff King | 2011-05-16 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'jm/mergetool-submodules' into maint | Junio C Hamano | 2011-05-15 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/format-patch-quote-special-in-from' into maint | Junio C Hamano | 2011-05-15 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | setup_revisions(): take pathspec from command line and --stdin correctly | Junio C Hamano | 2011-05-11 |
* | | | | | | | | | | | | | | Revert "Merge branch 'en/merge-recursive'" | Junio C Hamano | 2011-05-19 |
* | | | | | | | | | | | | | | Merge branch 'ci/commit--interactive-atomic' | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | Test atomic git-commit --interactive | Conrad Irwin | 2011-05-10 |
| * | | | | | | | | | | | | | | Allow git commit --interactive with paths | Conrad Irwin | 2011-05-09 |
| * | | | | | | | | | | | | | | t7501.8: feed a meaningful command | Jeff King | 2011-05-09 |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | tests: check git does not barf on merge.ff values for future versions of git | Jonathan Nieder | 2011-05-06 |
| * | | | | | | | | | | | | | | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 |
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config | Junio C Hamano | 2011-05-06 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | / / / | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'bf/commit-template-no-cleanup' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | Do not strip empty lines / trailing spaces from a commit message template | Boris Faure | 2011-05-11 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotes | Junio C Hamano | 2011-05-09 |
* | | | | | | | | | | | | | | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | Mark dirstat error messages for translation | Johan Herland | 2011-04-29 |
| * | | | | | | | | | | | | | | Improve error handling when parsing dirstat parameters | Johan Herland | 2011-04-29 |
| * | | | | | | | | | | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstat | Johan Herland | 2011-04-29 |
| * | | | | | | | | | | | | | | Allow specifying --dirstat cut-off percentage as a floating point number | Johan Herland | 2011-04-29 |
| * | | | | | | | | | | | | | | Add config variable for specifying default --dirstat behavior | Johan Herland | 2011-04-29 |
| * | | | | | | | | | | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file | Johan Herland | 2011-04-29 |
| * | | | | | | | | | | | | | | Make --dirstat=0 output directories that contribute < 0.1% of changes | Johan Herland | 2011-04-29 |
| * | | | | | | | | | | | | | | Add several testcases for --dirstat and friends | Johan Herland | 2011-04-29 |