| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| * | | | | | Merge branch 'bc/t5505-fix' | Junio C Hamano | 2010-04-03 | 1 | -41/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | t/t5505-remote.sh: escape * to prevent interpretation by shell as glob | Brandon Casey | 2010-03-20 | 1 | -1/+1 |
| | * | | | | | t5505: add missing && | Brandon Casey | 2010-03-20 | 1 | -1/+1 |
| | * | | | | | t5505: remove unnecessary subshell invocations | Brandon Casey | 2010-03-20 | 1 | -39/+4 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge branch 'gh/maint-stash-show-error-message' | Junio C Hamano | 2010-04-03 | 1 | -2/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Improve error messages from 'git stash show' | Gustaf Hendeby | 2010-03-16 | 1 | -2/+6 |
| * | | | | | | Merge branch 'rs/threaded-grep-context' | Junio C Hamano | 2010-04-03 | 2 | -14/+19 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | grep: enable threading for context line printing | René Scharfe | 2010-03-15 | 2 | -14/+18 |
| * | | | | | | | Merge branch 'bc/maint-daemon-sans-ss-family' | Junio C Hamano | 2010-04-03 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | daemon.c: avoid accessing ss_family member of struct sockaddr_storage | Brandon Casey | 2010-03-16 | 1 | -4/+7 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'bc/acl-test' | Junio C Hamano | 2010-04-03 | 1 | -17/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | t/t1304: make a second colon optional in the mask ACL check | Brandon Casey | 2010-03-16 | 1 | -1/+1 |
| | * | | | | | | | t/t1304: set the ACL effective rights mask | Brandon Casey | 2010-03-16 | 1 | -0/+1 |
| | * | | | | | | | t/t1304: use 'test -r' to test readability rather than looking at mode bits | Brandon Casey | 2010-03-16 | 1 | -14/+1 |
| | * | | | | | | | t/t1304: set the Default ACL base entries | Brandon Casey | 2010-03-16 | 1 | -0/+1 |
| | * | | | | | | | t/t1304: avoid -d option to setfacl | Brandon Casey | 2010-03-16 | 1 | -2/+2 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'ja/send-email-ehlo' | Junio C Hamano | 2010-04-03 | 1 | -3/+77 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | git-send-email.perl - try to give real name of the calling host to HELO/EHLO | Jari Aalto | 2010-03-14 | 1 | -1/+67 |
| | * | | | | | | | git-send-email.perl: add option --smtp-debug | Jari Aalto | 2010-03-14 | 1 | -2/+7 |
| | * | | | | | | | git-send-email.perl: improve error message in send_message() | Jari Aalto | 2010-03-14 | 1 | -1/+4 |
| * | | | | | | | | Merge branch 'do/rebase-i-arbitrary' | Junio C Hamano | 2010-04-03 | 2 | -2/+9 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | rebase--interactive: don't require what's rebased to be a branch | Dave Olszewski | 2010-03-14 | 2 | -2/+9 |
| * | | | | | | | | | Merge branch 'ak/everyday-git' | Junio C Hamano | 2010-04-03 | 1 | -47/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | everyday: fsck and gc are not everyday operations | Anders Kaseorg | 2010-03-16 | 1 | -47/+4 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Makefile: future-proof Cygwin version check | Jonathan Nieder | 2010-04-03 | 1 | -1/+1 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |