Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: document format of conflicts from checkout -m | Jonathan Nieder | 2010-03-20 | 1 | -4/+61 |
* | Update draft release notes to 1.7.1 | Junio C Hamano | 2010-03-20 | 1 | -2/+34 |
* | Merge branch 'jk/maint-add-ignored-dir' | Junio C Hamano | 2010-03-20 | 3 | -4/+103 |
|\ | |||||
| * | tests for "git add ignored-dir/file" without -f | Junio C Hamano | 2010-03-13 | 1 | -0/+79 |
| * | dir: fix COLLECT_IGNORED on excluded prefixes | Jeff King | 2010-03-13 | 1 | -2/+18 |
| * | t0050: mark non-working test as such | Junio C Hamano | 2010-03-13 | 1 | -2/+6 |
* | | Merge branch 'ml/color-grep' | Junio C Hamano | 2010-03-20 | 6 | -43/+123 |
|\ \ | |||||
| * | | grep: Colorize selected, context, and function lines | Mark Lodato | 2010-03-08 | 4 | -2/+27 |
| * | | grep: Colorize filename, line number, and separator | Mark Lodato | 2010-03-08 | 4 | -34/+78 |
| * | | Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_* | Mark Lodato | 2010-03-07 | 3 | -7/+18 |
* | | | Merge branch 'jc/color-attrs' | Junio C Hamano | 2010-03-20 | 3 | -14/+41 |
|\ \ \ | |||||
| * | | | color: allow multiple attributes | Junio C Hamano | 2010-03-07 | 3 | -14/+41 |
* | | | | Merge branch 'cc/reset-keep' | Junio C Hamano | 2010-03-20 | 5 | -20/+229 |
|\ \ \ \ | |||||
| * | | | | Documentation: improve description of "git reset --keep" | Junio C Hamano | 2010-03-08 | 1 | -3/+6 |
| * | | | | reset: disallow using --keep when there are unmerged entries | Christian Couder | 2010-03-06 | 4 | -22/+28 |
| * | | | | reset: disallow "reset --keep" outside a work tree | Christian Couder | 2010-03-06 | 2 | -9/+18 |
| * | | | | Documentation: reset: describe new "--keep" option | Christian Couder | 2010-03-06 | 1 | -1/+48 |
| * | | | | reset: add test cases for "--keep" option | Christian Couder | 2010-01-24 | 2 | -1/+126 |
| * | | | | reset: add option "--keep" to "git reset" | Christian Couder | 2010-01-24 | 1 | -5/+24 |
* | | | | | Merge branch 'fl/askpass' | Junio C Hamano | 2010-03-20 | 5 | -13/+58 |
|\ \ \ \ \ | |||||
| * | | | | | git-core: Support retrieving passwords with GIT_ASKPASS | Frank Li | 2010-03-04 | 4 | -3/+41 |
| * | | | | | git-svn: Support retrieving passwords with GIT_ASKPASS | Frank Li | 2010-03-02 | 1 | -10/+17 |
* | | | | | | Merge branch 'bg/apply-fix-blank-at-eof' | Junio C Hamano | 2010-03-20 | 4 | -40/+450 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t3417: Add test cases for "rebase --whitespace=fix" | Björn Gustavsson | 2010-03-06 | 1 | -0/+126 |
| * | | | | | | t4124: Add additional tests of --whitespace=fix | Björn Gustavsson | 2010-03-06 | 1 | -0/+170 |
| * | | | | | | apply: Allow blank context lines to match beyond EOF | Björn Gustavsson | 2010-03-06 | 1 | -30/+138 |
| * | | | | | | apply: Remove the quick rejection test | Björn Gustavsson | 2010-03-06 | 2 | -5/+16 |
| * | | | | | | apply: Don't unnecessarily update line lengths in the preimage | Björn Gustavsson | 2010-03-06 | 1 | -11/+6 |
* | | | | | | | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 | 6 | -79/+92 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge-file: add option to select union merge favor | Bert Wesarg | 2010-03-02 | 2 | -6/+9 |
| * | | | | | | | merge-file: add option to specify the marker size | Bert Wesarg | 2010-03-02 | 3 | -2/+42 |
| * | | | | | | | refactor merge flags into xmparam_t | Bert Wesarg | 2010-03-02 | 4 | -29/+25 |
| * | | | | | | | make union merge an xdl merge favor | Bert Wesarg | 2010-03-02 | 3 | -45/+19 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-20 | 5 | -9/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update draft release notes to 1.7.0.3 | Junio C Hamano | 2010-03-20 | 1 | -1/+7 |
| * | | | | | | | fetch: Fix minor memory leak | Andreas Gruenbacher | 2010-03-20 | 1 | -2/+3 |
| * | | | | | | | fetch: Future-proof initialization of a refspec on stack | Andreas Gruenbacher | 2010-03-20 | 1 | -3/+1 |
| * | | | | | | | fetch: Check for a "^{}" suffix with suffixcmp() | Andreas Gruenbacher | 2010-03-20 | 1 | -1/+1 |
| * | | | | | | | daemon: parse_host_and_port SIGSEGV if port is specified | Imre Deak | 2010-03-20 | 1 | -1/+1 |
| * | | | | | | | Makefile: Fix CDPATH problem | Jonathan Nieder | 2010-03-20 | 1 | -0/+6 |
| * | | | | | | | pull: replace unnecessary sed invocation | Stephen Boyd | 2010-03-20 | 1 | -1/+1 |
* | | | | | | | | Fix a spelling mistake in a git-p4 console message | Benjamin C Meyer | 2010-03-20 | 1 | -1/+1 |
* | | | | | | | | Use test_expect_success for test setups | Brian Gernhardt | 2010-03-20 | 5 | -61/+70 |
* | | | | | | | | Makefile: Fix occasional GIT-CFLAGS breakage | Jonathan Nieder | 2010-03-20 | 1 | -10/+11 |
* | | | | | | | | notes.c: remove inappropriate call to return | Brandon Casey | 2010-03-20 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-17 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Documentation: receive.denyCurrentBranch defaults to 'refuse' | Thomas Rast | 2010-03-17 | 1 | -1/+1 |
| * | | | | | | | bash: complete *_HEAD refs if present | Ian Ward Comfort | 2010-03-17 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-16 | 1 | -22/+24 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Documentation/git-read-tree: clarify 2-tree merge | Michael J Gruber | 2010-03-15 | 1 | -13/+15 |