summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/index-pack-streaming-fix'Junio C Hamano2012-07-151-10/+13
|\
| * index-pack: loop while inflating objects in unpack_dataJeff King2012-07-101-10/+13
* | Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano2012-07-151-1/+4
* | Merge branch 'cw/amend-commit-without-message'Junio C Hamano2012-07-151-1/+1
|\ \
| * | Allow edit of empty message with commit --amendChris Webb2012-07-091-1/+1
* | | Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-152-2/+2
|\ \ \
| * | | add: create ADD_EDIT.patch with mode 0666Jeff King2012-07-091-1/+1
| * | | Restore umasks influence on the permissions of work tree created by cloneAlex Riesen2012-07-091-1/+1
| |/ /
* | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-151-117/+440
|\ \ \
| * | | apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-091-0/+3
| * | | apply: register conflicted stages to the indexJunio C Hamano2012-07-091-6/+60
| * | | apply: --3way with add/add conflictJunio C Hamano2012-07-091-8/+62
| * | | apply: move verify_index_match() higherJunio C Hamano2012-07-091-10/+10
| * | | apply: plug the three-way merge logic inJunio C Hamano2012-07-091-3/+50
| * | | apply: fall back on three-way mergeJunio C Hamano2012-07-091-1/+45
| * | | apply: accept -3/--3way command line optionJunio C Hamano2012-07-091-2/+23
| * | | apply: move "already exists" logic to check_to_create()Junio C Hamano2012-07-091-11/+29
| * | | apply: move check_to_create_blob() closer to its sole callerJunio C Hamano2012-07-091-23/+23
| * | | apply: further split load_preimage()Junio C Hamano2012-07-091-19/+40
| * | | apply: refactor "previous patch" logicJunio C Hamano2012-07-091-26/+56
| * | | apply: split load_preimage() helper function outJunio C Hamano2012-07-091-3/+12
| * | | apply: factor out checkout_target() helper functionJunio C Hamano2012-07-091-7/+13
| * | | apply: refactor read_file_or_gitlink()Junio C Hamano2012-07-091-7/+11
| * | | apply: clear_image() clears things a bit moreJunio C Hamano2012-07-091-2/+2
| * | | apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano2012-07-091-2/+8
| * | | apply: fix an incomplete comment in check_patch()Junio C Hamano2012-07-091-9/+15
* | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-131-0/+1
|\ \ \ \
| * | | | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-081-0/+1
* | | | | Merge branch 'tr/maint-show-walk'Junio C Hamano2012-07-131-0/+3
|\ \ \ \ \
| * | | | | show: fix "range implies walking"Junio C Hamano2012-06-191-0/+3
* | | | | | 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