summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lp/no-cmd-http-fetch'Junio C Hamano2012-06-251-3/+0
|\
| * builtin.h: remove unused cmd_<foo> declarationsLuka Perkov2012-06-151-3/+0
* | Merge branch 'cn/cherry-pick-range-docs'Junio C Hamano2012-06-252-1/+13
|\ \
| * | git-cherry-pick.txt: clarify the use of revision range notationCarlos Martín Nieto2012-06-151-1/+12
| * | Documentation: --no-walk is no-op if range is specifiedCarlos Martín Nieto2012-06-151-0/+1
* | | Merge branch 'lm/git-blame-el'Junio C Hamano2012-06-251-36/+37
|\ \ \
| * | | git-blame.el: Do not use bare 0 to mean (point-min)Lawrence Mitchell2012-06-141-1/+1
| * | | git-blame.el: Use with-current-buffer where appropriateLawrence Mitchell2012-06-141-37/+37
| * | | git-blame.el: Do not use goto-line in lisp codeRüdiger Sonderfeld2012-06-141-1/+2
* | | | Merge branch 'rs/ipv6-ssh-url'Junio C Hamano2012-06-251-1/+1
|\ \ \ \
| * | | | git: Wrong parsing of ssh urls with IPv6 literals ignores portRené Scharfe2012-06-131-1/+1
* | | | | Merge branch 'jc/ustar-checksum-is-unsigned'Junio C Hamano2012-06-251-3/+3
|\ \ \ \ \
| * | | | | archive: ustar header checksum is computed unsignedJunio C Hamano2012-06-131-3/+3
* | | | | | Merge branch 'rs/git-blame-mapcar-mapc'Junio C Hamano2012-06-251-1/+1
|\ \ \ \ \ \
| * | | | | | git-blame.el: use mapc instead of mapcarRüdiger Sonderfeld2012-06-101-1/+1
* | | | | | | Merge branch 'rr/doc-commit'Junio C Hamano2012-06-251-0/+8
|\ \ \ \ \ \ \
| * | | | | | | commit: document a couple of optionsRamkumar Ramachandra2012-06-081-0/+8
* | | | | | | | Merge branch 'nd/i18n-misc'Junio C Hamano2012-06-253-10/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | rerere: remove i18n legos in result messageNguyễn Thái Ngọc Duy2012-06-071-6/+6
| * | | | | | | | notes-merge: remove i18n legos in merge result messageNguyễn Thái Ngọc Duy2012-06-071-2/+4
| * | | | | | | | reflog: remove i18n legos in pruning messageNguyễn Thái Ngọc Duy2012-06-071-2/+4
* | | | | | | | | Merge branch 'nd/i18n-branch-lego'Junio C Hamano2012-06-251-15/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove i18n legos in notifying new branch tracking setupNguyễn Thái Ngọc Duy2012-06-071-15/+23
* | | | | | | | | | Merge branch 'jk/no-more-asciidoc7'Junio C Hamano2012-06-254-32/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs: drop antique comment from MakefileJeff King2012-05-301-9/+0
| * | | | | | | | | | docs: drop asciidoc7compatible flagJeff King2012-05-304-23/+0
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-06-252-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-submodule.sh: fix filename in comment.Michał Górny2012-06-251-1/+1
| * | | | | | | | | | | git-add--interactive.perl: Remove two unused variablesThomas Badie2012-06-251-2/+0
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-06-225-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Documentation: Fix misspellingsLeila Muhtasib2012-06-225-6/+6
* | | | | | | | | | | | Merge branch 'vr/help-per-platform'Junio C Hamano2012-06-221-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Restore use of 'help.format' configuration property in 'git help'Pat Thoyts2012-06-221-3/+3
* | | | | | | | | | | | | Sync with 1.7.11.1Junio C Hamano2012-06-212-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Git 1.7.11.1v1.7.11.1Junio C Hamano2012-06-214-3/+13
* | | | | | | | | | | | | The first batch for 1.7.12Junio C Hamano2012-06-212-1/+56
* | | | | | | | | | | | | Merge branch 'jk/maint-t1304-setfacl'Junio C Hamano2012-06-211-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1304: improve setfacl prerequisite setupJeff King2012-06-071-10/+9
* | | | | | | | | | | | | | Merge branch 'vr/help-per-platform'Junio C Hamano2012-06-212-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | help: use HTML as the default help format on WindowsVincent van Ravesteijn2012-06-062-1/+16
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/ls-files-i-dir'Junio C Hamano2012-06-216-10/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | dir.c: make excluded() file scope staticJunio C Hamano2012-06-052-2/+1
| * | | | | | | | | | | | | unpack-trees.c: use path_excluded() in check_ok_to_remove()Junio C Hamano2012-06-052-1/+11
| * | | | | | | | | | | | | builtin/add.c: use path_excluded()Junio C Hamano2012-06-051-1/+5
| * | | | | | | | | | | | | path_excluded(): update API to less cache-entry centricJunio C Hamano2012-06-053-15/+30
| * | | | | | | | | | | | | ls-files -i: micro-optimize path_excluded()Junio C Hamano2012-06-031-0/+18
| * | | | | | | | | | | | | ls-files -i: pay attention to exclusion of leading pathsJunio C Hamano2012-06-033-6/+59
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/version-string'Junio C Hamano2012-06-218-9/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | http: get default user-agent from git_user_agentJeff King2012-06-032-5/+3
| * | | | | | | | | | | | | version: add git_user_agent functionJeff King2012-06-033-0/+26