aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
| * | | | | | | | | | | xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-20
| * | | | | | | | | | | tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-20
| * | | | | | | | | | | tests: document format of conflicts from checkout -mJonathan Nieder2010-03-20
* | | | | | | | | | | | Merge branch 'ef/cherry-abbrev'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ls: remove redundant logicErik Faye-Lund2010-03-21
| * | | | | | | | | | | | cherry: support --abbrev optionErik Faye-Lund2010-03-21
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'bw/template-tool-buildconfig'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Modernize git calling conventions in hook templatesBen Walton2010-03-20
| * | | | | | | | | | | | Make templates honour SHELL_PATH and PERL_PATHBen Walton2010-03-20
* | | | | | | | | | | | | Merge branch 'mg/mailmap-update'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaMichael J Gruber2010-03-20
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bc/t5505-fix'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t/t5505-remote.sh: escape * to prevent interpretation by shell as globBrandon Casey2010-03-20
| * | | | | | | | | | | | | t5505: add missing &&Brandon Casey2010-03-20
| * | | | | | | | | | | | | t5505: remove unnecessary subshell invocationsBrandon Casey2010-03-20
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'gh/maint-stash-show-error-message'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Improve error messages from 'git stash show'Gustaf Hendeby2010-03-16
* | | | | | | | | | | | | | Merge branch 'rs/threaded-grep-context'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: enable threading for context line printingRené Scharfe2010-03-15
* | | | | | | | | | | | | | | Merge branch 'bc/maint-daemon-sans-ss-family'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | daemon.c: avoid accessing ss_family member of struct sockaddr_storageBrandon Casey2010-03-16
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bc/acl-test'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t/t1304: make a second colon optional in the mask ACL checkBrandon Casey2010-03-16
| * | | | | | | | | | | | | | | t/t1304: set the ACL effective rights maskBrandon Casey2010-03-16
| * | | | | | | | | | | | | | | t/t1304: use 'test -r' to test readability rather than looking at mode bitsBrandon Casey2010-03-16
| * | | | | | | | | | | | | | | t/t1304: set the Default ACL base entriesBrandon Casey2010-03-16
| * | | | | | | | | | | | | | | t/t1304: avoid -d option to setfaclBrandon Casey2010-03-16
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ja/send-email-ehlo'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-send-email.perl - try to give real name of the calling host to HELO/EHLOJari Aalto2010-03-14
| * | | | | | | | | | | | | | | git-send-email.perl: add option --smtp-debugJari Aalto2010-03-14
| * | | | | | | | | | | | | | | git-send-email.perl: improve error message in send_message()Jari Aalto2010-03-14
* | | | | | | | | | | | | | | | Merge branch 'do/rebase-i-arbitrary'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase--interactive: don't require what's rebased to be a branchDave Olszewski2010-03-14
* | | | | | | | | | | | | | | | | Merge branch 'ak/everyday-git'Junio C Hamano2010-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | everyday: fsck and gc are not everyday operationsAnders Kaseorg2010-03-16
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Makefile: future-proof Cygwin version checkJonathan Nieder2010-04-03
* | | | | | | | | | | | | | | | | Fix _XOPEN_SOURCE problem on DragonFlyYONETANI Tomokazu2010-04-02
* | | | | | | | | | | | | | | | | builtin/commit: remove unnecessary variable definitionMarkus Heidelberg2010-04-02
* | | | | | | | | | | | | | | | | builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg2010-04-02
* | | | | | | | | | | | | | | | | Integrate version 3 ciabot scripts into contrib/.Eric Raymond2010-04-02
* | | | | | | | | | | | | | | | | Makefile: update defaults for modern CygwinEric Blake2010-04-01
* | | | | | | | | | | | | | | | | Sync with 1.7.0.4Junio C Hamano2010-03-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Git 1.7.0.4v1.7.0.4Junio C Hamano2010-03-31
| * | | | | | | | | | | | | | | | Merge branch 'jc/maint-refs-dangling' into maintJunio C Hamano2010-03-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Documentation: show-ref <pattern>s are optionalHolger Weiß2010-03-31
| * | | | | | | | | | | | | | | | | Link against libiconv on IRIXHolger Weiß2010-03-31
| * | | | | | | | | | | | | | | | | Don't redefine htonl and ntohl on big-endianHolger Weiß2010-03-31
| * | | | | | | | | | | | | | | | | gitweb: git_get_project_config requires only $git_dir, not also $projectJakub Narebski2010-03-31
| * | | | | | | | | | | | | | | | | Updated the usage string of git resetJan Stępień2010-03-31