summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* imap-send: support CRAM-MD5 authenticationHitoshi Mitake2010-02-172-15/+135
* Merge branch 'maint'Junio C Hamano2010-02-141-0/+1
|\
| * Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-02-141-0/+1
| |\
| | * fix minor memory leak in get_tree_entry()René Scharfe2010-02-141-0/+1
* | | Merge branch 'maint'Junio C Hamano2010-02-131-0/+11
|\ \ \ | |/ /
| * | Start 1.7.0 maintenance trackJunio C Hamano2010-02-133-2/+13
* | | Merge branch 'rs/git-dir-cleanup'Junio C Hamano2010-02-135-4/+96
|\ \ \
| * | | Resurrect "git grep --no-index"Junio C Hamano2010-02-133-1/+93
| * | | setenv(GIT_DIR) clean-upRené Scharfe2010-02-062-3/+3
* | | | Merge branch 'jk/cherry-pick-reword'Junio C Hamano2010-02-131-23/+19
|\ \ \ \
| * | | | cherry-pick: prettify the advice messageJeff King2010-02-111-4/+6
| * | | | cherry-pick: show commit name instead of sha1Jeff King2010-02-111-7/+7
| * | | | cherry-pick: format help message as strbufJeff King2010-02-111-4/+4
| * | | | cherry-pick: refactor commit parsing codeJeff King2010-02-111-8/+2
| * | | | cherry-pick: rewrap advice messageJeff King2010-02-111-4/+4
* | | | | Merge branch 'jk/grep-double-dash'Junio C Hamano2010-02-132-0/+43
|\ \ \ \ \
| * | | | | accept "git grep -- pattern"Jeff King2010-02-072-0/+43
* | | | | | Start 1.7.1 cycleJunio C Hamano2010-02-133-2/+19
| |_|_|/ / |/| | | |
* | | | | Git 1.7.0v1.7.0Junio C Hamano2010-02-123-1/+11
* | | | | Merge branch 'maint'Junio C Hamano2010-02-122-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix typo in 1.6.6.2 release notesJunio C Hamano2010-02-121-1/+1
| * | | | Re-fix check-ref-format documentation mark-upJunio C Hamano2010-02-121-1/+1
* | | | | archive documentation: attributes are taken from the tree by defaultJunio C Hamano2010-02-121-0/+8
* | | | | Documentation: minor fixes to RelNotes-1.7.0Michael J Gruber2010-02-121-8/+8
* | | | | bash: support 'git am's new '--continue' optionSZEDER Gábor2010-02-121-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2010-02-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | filter-branch: Fix error message for --prune-empty --commit-filterJacob Helwig2010-02-111-1/+1
* | | | | am: switch --resolved to --continueJeff King2010-02-112-3/+5
* | | | | Update draft release notes to 1.7.0 one more timeJunio C Hamano2010-02-101-15/+1
* | | | | Sync with 1.6.6.2Junio C Hamano2010-02-104-4/+53
|\ \ \ \ \ | |/ / / /
| * | | | Git 1.6.6.2v1.6.6.2Junio C Hamano2010-02-104-3/+50
| * | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-101-2/+4
| |\ \ \ \
| | * | | | t8003: check exit code of command and error message separatelyJunio C Hamano2010-02-101-2/+4
| * | | | | Merge branch 'sp/maint-fast-import-large-blob' into maintJunio C Hamano2010-02-105-20/+227
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'gp/maint-cvsserver' into maintJunio C Hamano2010-02-101-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-104-10/+86
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'il/maint-xmallocz' into maintJunio C Hamano2010-02-104-10/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2010-02-102-1/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/include-termios-for-osol' into maintJunio C Hamano2010-02-101-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-102-1/+58
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/maint-archive-match-pathspec' into maintJunio C Hamano2010-02-101-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | check-ref-format documentation: fix enumeration mark-upJunio C Hamano2010-02-101-1/+1
* | | | | | | | | | | | | | Documentation: quote braces in {upstream} notationThomas Rast2010-02-101-1/+1
* | | | | | | | | | | | | | t3902: Protect against OS X normalizationBrian Gernhardt2010-02-081-4/+4
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-085-14/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-082-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | blame: prevent a segv when -L given start > EOFJay Soffian2010-02-082-1/+9
| | * | | | | | | | | | | | Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2010-02-012-9/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2010-02-012-29/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-push-doc-status' into maintJunio C Hamano2010-02-081-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \