summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/require-perl-5.8'Junio C Hamano2010-10-2616-13/+27
|\
| * perl: use "use warnings" instead of -wÆvar Arnfjörð Bjarmason2010-09-277-7/+10
| * perl: bump the required Perl version to 5.8 from 5.6.[21]Ævar Arnfjörð Bjarmason2010-09-2714-6/+17
* | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-266-6/+41
|\ \
| * | diff: add synonyms for -M, -C, -BKevin Ballard2010-09-292-3/+25
| * | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-295-3/+16
* | | Merge branch 'jp/send-email-to-cmd'Junio C Hamano2010-10-263-18/+59
|\ \ \
| * | | git-send-email.perl: Add --to-cmdJoe Perches2010-09-273-18/+59
| | |/ | |/|
* | | Merge branch 'as/daemon-multi-listen'Junio C Hamano2010-10-262-27/+54
|\ \ \
| * | | daemon: allow more than one host address given via --listenAlexander Sulfrian2010-09-282-9/+23
| * | | daemon: add helper function named_sock_setupAlexander Sulfrian2010-09-281-20/+33
* | | | Merge branch 'dm/mergetool-vimdiff'Junio C Hamano2010-10-261-10/+16
|\ \ \ \
| * | | | mergetool-lib: make the three-way diff the default for vim/gvimDan McGee2010-09-291-3/+15
| * | | | mergetool-lib: add a three-way diff view for vim/gvimDan McGee2010-09-151-2/+7
| * | | | mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee2010-09-151-14/+3
* | | | | Merge branch 'kf/post-receive-sample-hook'Junio C Hamano2010-10-261-16/+31
|\ \ \ \ \
| * | | | | post-receive-email: ensure sent messages are not emptyKevin P. Fleming2010-09-101-16/+31
* | | | | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-2612-97/+351
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-273-0/+207
| * | | | | merge-recursive --patienceJustin Frankel2010-08-266-0/+14
| * | | | | ll-merge: replace flag argument with options structJonathan Nieder2010-08-267-66/+104
| * | | | | merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-264-31/+26
* | | | | | Merge branch 'ml/completion-zsh'Junio C Hamano2010-10-261-4/+46
|\ \ \ \ \ \
| * | | | | | completion: make compatible with zshMark Lodato2010-09-091-4/+46
* | | | | | | Merge branch 'po/sendemail'Junio C Hamano2010-10-263-3/+19
|\ \ \ \ \ \ \
| * | | | | | | New send-email option smtpserveroption.Pascal Obry2010-09-063-1/+17
| * | | | | | | Remove @smtp_host_parts variable as not used.Pascal Obry2010-09-061-1/+1
| * | | | | | | Minor indentation fix.Pascal Obry2010-09-061-1/+1
* | | | | | | | Merge branch 'en/tree-walk-optim'Junio C Hamano2010-10-261-14/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | diff_tree(): Skip skip_uninteresting() when all remaining paths interestingElijah Newren2010-08-261-13/+12
| * | | | | | | | tree_entry_interesting(): Make return value more specificElijah Newren2010-08-261-1/+1
| * | | | | | | | tree-walk: Correct bitrotted comment about tree_entry()Elijah Newren2010-08-261-1/+4
| * | | | | | | | Document pre-condition for tree_entry_interestingElijah Newren2010-08-261-0/+2
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-10-261-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix copy-pasted comments related to tree diff handling.Yann Dirson2010-10-251-2/+2
* | | | | | | | | | Sync with 1.7.3.2Junio C Hamano2010-10-2157-158/+167
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Git 1.7.3.2v1.7.3.2Junio C Hamano2010-10-214-3/+9
| * | | | | | | | | Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano2010-10-2155-157/+157
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix {update,checkout}-index usage stringsŠtěpán Němec2010-10-082-2/+2
| | * | | | | | | | | Put a space between `<' and argument in pack-objects usage stringŠtěpán Němec2010-10-081-1/+1
| | * | | | | | | | | Remove stray quotes in --pretty and --format documentationŠtěpán Němec2010-10-082-3/+3
| | * | | | | | | | | Use parentheses and `...' where appropriateŠtěpán Němec2010-10-0831-33/+33
| | * | | | | | | | | Fix odd markup in --diff-filter documentationŠtěpán Němec2010-10-081-2/+2
| | * | | | | | | | | Use angles for placeholders consistentlyŠtěpán Němec2010-10-0827-118/+118
| * | | | | | | | | | Merge branch 'mg/fix-build-remote-helpers' into maintJunio C Hamano2010-10-211-0/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | remote-helpers: build in platform independent directoryMichael J Gruber2010-09-271-0/+3
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | {cvs,svn}import: use the new 'git read-tree --empty'Thomas Rast2010-10-192-2/+2
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-10-195-25/+49
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'Antonio Ospite2010-10-191-1/+1
| * | | | | | | | | | Clarify and extend the "git diff" format documentationAndreas Gruenbacher2010-10-191-10/+30