Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 | |
| * | | | | | | | | | | | xdl_merge(): add optional ancestor label to diff3-style output | 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 'ef/cherry-abbrev' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | ls: remove redundant logic | Erik Faye-Lund | 2010-03-21 | |
| * | | | | | | | | | | | | cherry: support --abbrev option | Erik Faye-Lund | 2010-03-21 | |
| |/ / / / / / / / / / / | ||||
* | | | | | | | | | | | | Merge branch 'bw/template-tool-buildconfig' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | Modernize git calling conventions in hook templates | Ben Walton | 2010-03-20 | |
| * | | | | | | | | | | | | Make templates honour SHELL_PATH and PERL_PATH | Ben Walton | 2010-03-20 | |
* | | | | | | | | | | | | | Merge branch 'mg/mailmap-update' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela | Michael J Gruber | 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 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'gh/maint-stash-show-error-message' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | Improve error messages from 'git stash show' | Gustaf Hendeby | 2010-03-16 | |
* | | | | | | | | | | | | | | Merge branch 'rs/threaded-grep-context' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | grep: enable threading for context line printing | René Scharfe | 2010-03-15 | |
* | | | | | | | | | | | | | | | Merge branch 'bc/maint-daemon-sans-ss-family' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | daemon.c: avoid accessing ss_family member of struct sockaddr_storage | Brandon Casey | 2010-03-16 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge branch 'bc/acl-test' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | t/t1304: make a second colon optional in the mask ACL check | Brandon Casey | 2010-03-16 | |
| * | | | | | | | | | | | | | | | t/t1304: set the ACL effective rights mask | Brandon Casey | 2010-03-16 | |
| * | | | | | | | | | | | | | | | t/t1304: use 'test -r' to test readability rather than looking at mode bits | Brandon Casey | 2010-03-16 | |
| * | | | | | | | | | | | | | | | t/t1304: set the Default ACL base entries | Brandon Casey | 2010-03-16 | |
| * | | | | | | | | | | | | | | | t/t1304: avoid -d option to setfacl | Brandon Casey | 2010-03-16 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge branch 'ja/send-email-ehlo' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | git-send-email.perl - try to give real name of the calling host to HELO/EHLO | Jari Aalto | 2010-03-14 | |
| * | | | | | | | | | | | | | | | git-send-email.perl: add option --smtp-debug | Jari Aalto | 2010-03-14 | |
| * | | | | | | | | | | | | | | | git-send-email.perl: improve error message in send_message() | Jari Aalto | 2010-03-14 | |
* | | | | | | | | | | | | | | | | Merge branch 'do/rebase-i-arbitrary' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | rebase--interactive: don't require what's rebased to be a branch | Dave Olszewski | 2010-03-14 | |
* | | | | | | | | | | | | | | | | | Merge branch 'ak/everyday-git' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | everyday: fsck and gc are not everyday operations | Anders Kaseorg | 2010-03-16 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Makefile: future-proof Cygwin version check | Jonathan Nieder | 2010-04-03 | |
* | | | | | | | | | | | | | | | | | Fix _XOPEN_SOURCE problem on DragonFly | YONETANI Tomokazu | 2010-04-02 | |
* | | | | | | | | | | | | | | | | | builtin/commit: remove unnecessary variable definition | Markus Heidelberg | 2010-04-02 | |
* | | | | | | | | | | | | | | | | | builtin/commit: fix duplicated sentence in a comment | Markus Heidelberg | 2010-04-02 | |
* | | | | | | | | | | | | | | | | | Integrate version 3 ciabot scripts into contrib/. | Eric Raymond | 2010-04-02 | |
* | | | | | | | | | | | | | | | | | Makefile: update defaults for modern Cygwin | Eric Blake | 2010-04-01 | |
* | | | | | | | | | | | | | | | | | Sync with 1.7.0.4 | Junio C Hamano | 2010-03-31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Git 1.7.0.4v1.7.0.4 | Junio C Hamano | 2010-03-31 | |
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-refs-dangling' into maint | Junio C Hamano | 2010-03-31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | Documentation: show-ref <pattern>s are optional | Holger Weiß | 2010-03-31 | |
| * | | | | | | | | | | | | | | | | | Link against libiconv on IRIX | Holger Weiß | 2010-03-31 | |
| * | | | | | | | | | | | | | | | | | Don't redefine htonl and ntohl on big-endian | Holger Weiß | 2010-03-31 | |
| * | | | | | | | | | | | | | | | | | gitweb: git_get_project_config requires only $git_dir, not also $project | Jakub Narebski | 2010-03-31 | |
| * | | | | | | | | | | | | | | | | | Updated the usage string of git reset | Jan Stępień | 2010-03-31 |