summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cw/help-over-network'Junio C Hamano2012-07-091-4/+15
|\
| * Allow help.htmlpath to be a URL prefixChris Webb2012-06-281-3/+5
| * Add config variable to set HTML path for git-help --webChris Webb2012-06-281-1/+10
* | Merge branch 'js/fast-export-paths-with-spaces'Junio C Hamano2012-07-091-0/+2
|\ \
| * | fast-export: quote paths with spacesJay Soffian2012-06-271-0/+2
* | | Merge branch 'cw/no-detaching-an-unborn'Junio C Hamano2012-07-091-0/+2
|\ \ \
| * | | git-checkout: disallow --detach on unborn branchChris Webb2012-06-261-0/+2
* | | | Merge branch 'mm/credential-plumbing'Junio C Hamano2012-07-091-0/+31
|\ \ \ \
| * | | | git credential fill: output the whole 'struct credential'Matthieu Moy2012-06-251-4/+1
| * | | | add 'git credential' plumbing commandJavier Roucher Iglesias2012-06-251-0/+34
* | | | | Merge branch 'jc/maint-blame-unique-abbrev'Junio C Hamano2012-07-091-4/+21
|\ \ \ \ \
| * | | | | blame: compute abbreviation width that ensures uniquenessJunio C Hamano2012-07-021-4/+21
* | | | | | Merge branch 'rj/platform-pread-may-be-thread-unsafe'Junio C Hamano2012-07-091-2/+2
|\ \ \ \ \ \
| * | | | | | index-pack: Disable threading on cygwinJunio C Hamano2012-06-261-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-091-9/+16
|\ \ \ \ \ \
| * | | | | | config: write to $XDG_CONFIG_HOME/git/config file when appropriateHuynh Khoi Nguyen Nguyen2012-06-251-4/+1
| * | | | | | config: read (but not write) from $XDG_CONFIG_HOME/git/config fileHuynh Khoi Nguyen Nguyen2012-06-251-9/+19
* | | | | | | Merge branch 'nd/clone-single-fix'Junio C Hamano2012-07-041-2/+5
|\ \ \ \ \ \ \
| * | | | | | | clone: fix ref selection in --single-branch --branch=xxxNguyễn Thái Ngọc Duy2012-06-221-2/+5
| * | | | | | | Merge branch 'js/maint-fast-export-mark-error' into maintJunio C Hamano2012-06-171-1/+1
* | | | | | | | Merge branch 'hv/submodule-update-nuke-submodules'Junio C Hamano2012-06-281-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | update-index: allow overwriting existing submodule index entriesHeiko Voigt2012-06-111-6/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/stream-pack-objects'Junio C Hamano2012-06-281-6/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-objects: use streaming interface for reading large loose blobsNguyễn Thái Ngọc Duy2012-05-291-6/+67
* | | | | | | | | Merge branch 'nd/stream-index-pack'Junio C Hamano2012-06-281-23/+171
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: use streaming interface for collision test on large blobsNguyễn Thái Ngọc Duy2012-05-241-5/+77
| * | | | | | | | | index-pack: factor out unpack core from get_data_from_packNguyễn Thái Ngọc Duy2012-05-231-3/+24
| * | | | | | | | | index-pack: use streaming interface on large blobs (most of the time)Nguyễn Thái Ngọc Duy2012-05-231-8/+44
| * | | | | | | | | index-pack: hash non-delta objects while reading from streamNguyễn Thái Ngọc Duy2012-05-231-11/+30
* | | | | | | | | | Merge branch 'mm/verify-filename-fix'Junio C Hamano2012-06-283-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-183-4/+4
* | | | | | | | | | | Merge branch 'jk/diff-no-index-pager'Junio C Hamano2012-06-281-7/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix pager.diff with diff --no-indexJeff King2012-06-151-7/+17
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'rs/maint-grep-F' into maintJunio C Hamano2012-06-011-5/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano2012-06-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/i18n-misc'Junio C Hamano2012-06-251-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | reflog: remove i18n legos in pruning messageNguyễn Thái Ngọc Duy2012-06-071-2/+4
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge branch 'vr/help-per-platform'Junio C Hamano2012-06-211-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | help: use HTML as the default help format on WindowsVincent van Ravesteijn2012-06-061-1/+7
* | | | | | | | | | | | | Merge branch 'jc/ls-files-i-dir'Junio C Hamano2012-06-212-7/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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-051-2/+8
| * | | | | | | | | | | | | ls-files -i: pay attention to exclusion of leading pathsJunio C Hamano2012-06-031-6/+11
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/version-string'Junio C Hamano2012-06-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | move git_version_string into version.cJeff King2012-06-031-0/+1
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/clone-local'Junio C Hamano2012-06-211-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | clone: allow --no-local to turn off local optimizationsJeff King2012-05-301-5/+5
* | | | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-06-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status