| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | | | | | t6200: modernize with test_tick | Stephen Boyd | 2010-03-24 | 1 | -35/+29 | |
| | * | | | | | | | | | | | | | | | | | fmt-merge-msg: be quiet if nothing to merge | Stephen Boyd | 2010-03-24 | 2 | -0/+22 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-04-06 | 2 | -14/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | diff --check: honor conflict-marker-size attribute | Junio C Hamano | 2010-03-24 | 2 | -14/+33 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'ef/maint-empty-commit-log' | Junio C Hamano | 2010-04-06 | 2 | -1/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | rev-list: fix --pretty=oneline with empty message | Erik Faye-Lund | 2010-03-21 | 2 | -1/+13 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'sg/bash-completion' | Junio C Hamano | 2010-04-06 | 1 | -60/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | bash: completion for gitk aliases | SZEDER Gábor | 2010-02-24 | 1 | -0/+9 | |
| | * | | | | | | | | | | | | | | | | | | bash: support user-supplied completion scripts for aliases | SZEDER Gábor | 2010-02-24 | 1 | -4/+7 | |
| | * | | | | | | | | | | | | | | | | | | bash: support user-supplied completion scripts for user's git commands | SZEDER Gábor | 2010-02-24 | 1 | -55/+12 | |
| | * | | | | | | | | | | | | | | | | | | bash: improve aliased command recognition | SZEDER Gábor | 2010-02-24 | 1 | -3/+8 | |
| * | | | | | | | | | | | | | | | | | | | Revert "Link against libiconv on IRIX" | Junio C Hamano | 2010-04-05 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-04 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | pack-protocol.txt: fix pkt-line lengths | Tay Ray Chuan | 2010-04-04 | 1 | -4/+4 | |
| | * | | | | | | | | | | | | | | | | | | pack-protocol.txt: fix spelling | Tay Ray Chuan | 2010-04-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 | 5 | -9/+152 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 | 5 | -10/+152 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' | Junio C Hamano | 2010-04-03 | 1 | -7/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | http-backend: Don't infinite loop during die() | Shawn O. Pearce | 2010-03-24 | 1 | -7/+11 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/imap-send-unconfuse-from-line' | Junio C Hamano | 2010-04-03 | 2 | -8/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | imap-send: Remove limitation on message body | Ramkumar Ramachandra | 2010-03-24 | 2 | -8/+10 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list' | Junio C Hamano | 2010-04-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | rev-list: use default abbrev length when abbrev-commit is in effect | Michael J Gruber | 2010-03-24 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'mg/maint-send-email-lazy-editor' | Junio C Hamano | 2010-04-03 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | send-email: lazily assign editor variable | Michael J Gruber | 2010-03-25 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'rb/maint-python-path' | Junio C Hamano | 2010-04-03 | 5 | -4/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Correct references to /usr/bin/python which does not exist on FreeBSD | R. Tyler Ballance | 2010-03-24 | 5 | -4/+9 | |
| | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 | 15 | -79/+405 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | merge-recursive: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | | | | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 2 | -3/+6 | |
| | * | | | | | | | | | | | | | | | | | | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 | 2 | -41/+64 | |
| | * | | | | | | | | | | | | | | | | | | compat: add mempcpy() | Jonathan Nieder | 2010-03-20 | 1 | -0/+9 | |
| | * | | | | | | | | | | | | | | | | | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 2 | -1/+2 | |
| | * | | | | | | | | | | | | | | | | | | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 2 | -3/+9 | |
| | * | | | | | | | | | | | | | | | | | | merge_file(): add comment explaining behavior wrt conflict style | Jonathan Nieder | 2010-03-20 | 1 | -0/+6 | |
| | * | | | | | | | | | | | | | | | | | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 2 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 6 | -15/+17 | |
| | * | | | | | | | | | | | | | | | | | | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 2 | -2/+3 | |
| | * | | | | | | | | | | | | | | | | | | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 | 4 | -13/+20 | |
| | * | | | | | | | | | | | | | | | | | | xdl_merge(): add optional ancestor label to diff3-style output | Jonathan Nieder | 2010-03-20 | 2 | -2/+15 | |
| | * | | | | | | | | | | | | | | | | | | tests: document cherry-pick behavior in face of conflicts | Jonathan Nieder | 2010-03-20 | 1 | -0/+198 | |
| | * | | | | | | | | | | | | | | | | | | tests: document format of conflicts from checkout -m | Jonathan Nieder | 2010-03-20 | 1 | -4/+61 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'ef/cherry-abbrev' | Junio C Hamano | 2010-04-03 | 3 | -27/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | ls: remove redundant logic | Erik Faye-Lund | 2010-03-21 | 2 | -9/+4 | |
| | * | | | | | | | | | | | | | | | | | | | cherry: support --abbrev option | Erik Faye-Lund | 2010-03-21 | 1 | -18/+21 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'bw/template-tool-buildconfig' | Junio C Hamano | 2010-04-03 | 9 | -23/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Modernize git calling conventions in hook templates | Ben Walton | 2010-03-20 | 7 | -17/+17 | |
| | * | | | | | | | | | | | | | | | | | | | Make templates honour SHELL_PATH and PERL_PATH | Ben Walton | 2010-03-20 | 4 | -6/+19 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/mailmap-update' | Junio C Hamano | 2010-04-03 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela | Michael J Gruber | 2010-03-20 | 1 | -0/+3 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |