| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 | 5 | -3/+16 |
| * | merge-recursive: options to ignore whitespace changes | Justin Frankel | 2010-08-27 | 3 | -0/+207 |
| * | merge-recursive --patience | Justin Frankel | 2010-08-26 | 6 | -0/+14 |
| * | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 7 | -66/+104 |
| * | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 | 4 | -31/+26 |
| * | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 8 | -8/+45 |
| * | rerere: never renormalize | Jonathan Nieder | 2010-08-06 | 1 | -6/+5 |
| * | rerere: migrate to parse-options API | Jonathan Nieder | 2010-08-06 | 2 | -24/+119 |
| * | t4200 (rerere): modernize style | Jonathan Nieder | 2010-08-06 | 1 | -125/+180 |
| * | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 5 | -8/+19 |
| * | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 | 4 | -9/+28 |
| * | Documentation/technical: document ll_merge | Jonathan Nieder | 2010-08-06 | 1 | -0/+70 |
| * | merge-trees: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 2 | -1/+3 |
| * | merge-trees: push choice to renormalize away from low level | Jonathan Nieder | 2010-08-06 | 1 | -4/+5 |
| * | t6038 (merge.renormalize): check that it can be turned off | Jonathan Nieder | 2010-08-06 | 1 | -1/+49 |
| * | t6038 (merge.renormalize): try checkout -m and cherry-pick | Jonathan Nieder | 2010-08-06 | 1 | -0/+41 |
| * | t6038 (merge.renormalize): style nitpicks | Jonathan Nieder | 2010-08-06 | 1 | -8/+44 |
| * | Don't expand CRLFs when normalizing text during merge | Eyvind Bernhardsen | 2010-07-02 | 1 | -7/+20 |
| * | Try normalizing files to avoid delete/modify conflicts when merging | Eyvind Bernhardsen | 2010-07-02 | 2 | -3/+50 |
| * | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 8 | -2/+143 |
| * | Git 1.7.2-rc0v1.7.2-rc0 | Junio C Hamano | 2010-06-27 | 1 | -1/+11 |
| * | Merge branch 'cp/textconv-cat-file' | Junio C Hamano | 2010-06-27 | 7 | -15/+155 |
| |\ | |||||
| | * | git-cat-file.txt: Document --textconv | Michael J Gruber | 2010-06-24 | 1 | -2/+8 |
| | * | t/t8007: test textconv support for cat-file | Clément Poulain | 2010-06-18 | 1 | -0/+70 |
| | * | textconv: support for cat_file | Clément Poulain | 2010-06-18 | 3 | -8/+40 |
| | * | sha1_name: add get_sha1_with_context() | Clément Poulain | 2010-06-18 | 2 | -5/+37 |
| * | | Merge branch 'pb/maint-perl-errmsg-no-dir' | Junio C Hamano | 2010-06-27 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Git.pm: better error message | Philippe Bruhat (BooK) | 2010-06-18 | 1 | -2/+2 |
| * | | | Merge branch 'tr/send-email-8bit' | Junio C Hamano | 2010-06-27 | 3 | -0/+146 |
| |\ \ \ | |||||
| | * | | | send-email: ask about and declare 8bit mails | Thomas Rast | 2010-06-18 | 3 | -0/+146 |
| * | | | | Merge branch 'js/maint-am-rebase-invalid-author' | Junio C Hamano | 2010-06-27 | 2 | -6/+17 |
| |\ \ \ \ | |||||
| | * | | | | am: use get_author_ident_from_commit instead of mailinfo when rebasing | Jay Soffian | 2010-06-16 | 2 | -6/+17 |
| * | | | | | Merge branch 'ab/blame-textconv' | Junio C Hamano | 2010-06-27 | 4 | -21/+165 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | t/t8006: test textconv support for blame | Axel Bonnet | 2010-06-18 | 1 | -0/+80 |
| | * | | | | textconv: support for blame | Axel Bonnet | 2010-06-18 | 1 | -13/+72 |
| | * | | | | textconv: make the API public | Axel Bonnet | 2010-06-11 | 2 | -8/+12 |
| * | | | | | Merge branch 'jn/show-num-walks' | Junio C Hamano | 2010-06-27 | 1 | -0/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | DWIM 'git show -5' to 'git show --do-walk -5' | Jonathan Nieder | 2010-06-02 | 1 | -0/+4 |
| * | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-25 | 5 | -10/+10 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | msvc: Fix some compiler warnings | Ramsay Jones | 2010-06-25 | 1 | -4/+4 |
| | * | | | | | | Documentation: grep: fix asciidoc problem with -- | Christian Couder | 2010-06-25 | 1 | -1/+1 |
| | * | | | | | | msvc: Fix some "expr evaluates to function" compiler warnings | Ramsay Jones | 2010-06-24 | 3 | -5/+5 |
| * | | | | | | | Merge branch 'jk/url-decode' | Junio C Hamano | 2010-06-23 | 1 | -10/+18 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | url.c: "<scheme>://" part at the beginning should not be URL decoded | Junio C Hamano | 2010-06-23 | 1 | -10/+18 |
| * | | | | | | | | Update draft release notes to 1.7.2 | Junio C Hamano | 2010-06-22 | 1 | -12/+41 |
| * | | | | | | | | Merge branch 'jc/maint-simpler-common-prefix' | Junio C Hamano | 2010-06-22 | 1 | -13/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | common_prefix: simplify and fix scanning for prefixes | Junio C Hamano | 2010-06-16 | 1 | -13/+13 |
| | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'sb/format-patch-signature' | Junio C Hamano | 2010-06-22 | 6 | -4/+85 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | completion: Add --signature and format.signature | Stephen Boyd | 2010-06-16 | 1 | -1/+2 |
| | * | | | | | | | | format-patch: Add a signature option (--signature) | Stephen Boyd | 2010-06-16 | 5 | -3/+83 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |