Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'cw/ws-indent-with-tab' | Junio C Hamano | 2010-05-08 |
|\ | |||
| * | whitespace: tests for git-apply --whitespace=fix with tab-in-indent | Chris Webb | 2010-04-04 |
| * | whitespace: tests for git-diff --check with tab-in-indent error class | Chris Webb | 2010-04-04 |
* | | Merge branch 'jk/cached-textconv' | Junio C Hamano | 2010-05-08 |
|\ \ | |||
| * | | diff: cache textconv output | Jeff King | 2010-04-02 |
| |/ | |||
* | | Merge branch 'pc/remove-warn' | Junio C Hamano | 2010-05-08 |
|\ \ | |||
| * | | Introduce remove_or_warn function | Peter Collingbourne | 2010-03-28 |
* | | | test-lib: some shells do not let $? propagate into an eval | Jonathan Nieder | 2010-05-06 |
* | | | test-lib: Let tests specify commands to be run at end of test | Jonathan Nieder | 2010-05-04 |
* | | | clone: quell the progress report from init and report on clone | Junio C Hamano | 2010-05-04 |
* | | | test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+. | Michal Sojka | 2010-05-04 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-04-19 |
|\ \ \ | |||
| * | | | t7012: Mark missing tests as TODO | Michael J Gruber | 2010-04-19 |
* | | | | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format' | Junio C Hamano | 2010-04-18 |
|\ \ \ \ | |||
| * | | | | t3301: add tests to use --format="%N" | Junio C Hamano | 2010-04-18 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-17 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | t1010-mktree: Adjust expected result to code and documentation | Michael J Gruber | 2010-04-17 |
| * | | | | combined diff: correctly handle truncated file | Thomas Rast | 2010-04-17 |
| * | | | | Merge branch 'ef/maint-empty-commit-log' into maint | Junio C Hamano | 2010-04-09 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jc/conflict-marker-size' into maint | Junio C Hamano | 2010-04-09 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jc/maint-refs-dangling' into maint | Junio C Hamano | 2010-03-31 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | t6006: do not write to /tmp | Matthew Ogilvie | 2010-04-17 |
* | | | | | | | | t3507: Make test executable | Stephen Boyd | 2010-04-11 |
| |_|_|_|/ / / |/| | | | | | | |||
* | | | | | | | Merge branch 'jl/maint-submodule-gitfile-awareness' | Junio C Hamano | 2010-04-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Teach diff --submodule and status to handle .git files in submodules | Jens Lehmann | 2010-04-10 |
* | | | | | | | | Merge branch 'mg/notes-reflog' | Junio C Hamano | 2010-04-07 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | refs.c: Write reflogs for notes just like for branch heads | Michael J Gruber | 2010-03-29 |
| * | | | | | | | | t3301-notes: Test the creation of reflog entries | Michael J Gruber | 2010-03-29 |
* | | | | | | | | | Merge branch 'sb/fmt-merge-msg' | Junio C Hamano | 2010-04-06 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t6200: test fmt-merge-msg more | Stephen Boyd | 2010-03-24 |
| * | | | | | | | | | t6200: modernize with test_tick | Stephen Boyd | 2010-03-24 |
| * | | | | | | | | | fmt-merge-msg: be quiet if nothing to merge | Stephen Boyd | 2010-03-24 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-04-06 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||
| * | | | | | | | | diff --check: honor conflict-marker-size attribute | Junio C Hamano | 2010-03-24 |
* | | | | | | | | | Merge branch 'ef/maint-empty-commit-log' | Junio C Hamano | 2010-04-06 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| * | | | | | | | | rev-list: fix --pretty=oneline with empty message | Erik Faye-Lund | 2010-03-21 |
* | | | | | | | | | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 |
* | | | | | | | | | | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | tests: document cherry-pick behavior in face of conflicts | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | tests: document format of conflicts from checkout -m | Jonathan Nieder | 2010-03-20 |
* | | | | | | | | | | | Merge branch 'bc/t5505-fix' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t/t5505-remote.sh: escape * to prevent interpretation by shell as glob | Brandon Casey | 2010-03-20 |
| * | | | | | | | | | | | t5505: add missing && | Brandon Casey | 2010-03-20 |
| * | | | | | | | | | | | t5505: remove unnecessary subshell invocations | Brandon Casey | 2010-03-20 |
| | |/ / / / / / / / / | |/| | | | | | | | | |