aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/apply-3way'Junio C Hamano2012-07-15
|\
| * apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-09
| * apply: register conflicted stages to the indexJunio C Hamano2012-07-09
| * apply: --3way with add/add conflictJunio C Hamano2012-07-09
| * apply: move verify_index_match() higherJunio C Hamano2012-07-09
| * apply: plug the three-way merge logic inJunio C Hamano2012-07-09
| * apply: fall back on three-way mergeJunio C Hamano2012-07-09
| * apply: accept -3/--3way command line optionJunio C Hamano2012-07-09
| * apply: move "already exists" logic to check_to_create()Junio C Hamano2012-07-09
| * apply: move check_to_create_blob() closer to its sole callerJunio C Hamano2012-07-09
| * apply: further split load_preimage()Junio C Hamano2012-07-09
| * apply: refactor "previous patch" logicJunio C Hamano2012-07-09
| * apply: split load_preimage() helper function outJunio C Hamano2012-07-09
| * apply: factor out checkout_target() helper functionJunio C Hamano2012-07-09
| * apply: refactor read_file_or_gitlink()Junio C Hamano2012-07-09
| * apply: clear_image() clears things a bit moreJunio C Hamano2012-07-09
| * apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano2012-07-09
| * apply: fix an incomplete comment in check_patch()Junio C Hamano2012-07-09
* | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-13
|\ \
| * | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-08
* | | Merge branch 'tr/maint-show-walk'Junio C Hamano2012-07-13
|\ \ \
| * | | show: fix "range implies walking"Junio C Hamano2012-06-19
* | | | Merge branch 'cw/help-over-network'Junio C Hamano2012-07-09
|\ \ \ \
| * | | | Allow help.htmlpath to be a URL prefixChris Webb2012-06-28
| * | | | Add config variable to set HTML path for git-help --webChris Webb2012-06-28
| | |/ / | |/| |
* | | | Merge branch 'js/fast-export-paths-with-spaces'Junio C Hamano2012-07-09
|\ \ \ \
| * | | | fast-export: quote paths with spacesJay Soffian2012-06-27
| | |/ / | |/| |
* | | | Merge branch 'cw/no-detaching-an-unborn'Junio C Hamano2012-07-09
|\ \ \ \
| * | | | git-checkout: disallow --detach on unborn branchChris Webb2012-06-26
* | | | | Merge branch 'mm/credential-plumbing'Junio C Hamano2012-07-09
|\ \ \ \ \
| * | | | | git credential fill: output the whole 'struct credential'Matthieu Moy2012-06-25
| * | | | | add 'git credential' plumbing commandJavier Roucher Iglesias2012-06-25
* | | | | | Merge branch 'jc/maint-blame-unique-abbrev'Junio C Hamano2012-07-09
|\ \ \ \ \ \
| * | | | | | blame: compute abbreviation width that ensures uniquenessJunio C Hamano2012-07-02
* | | | | | | Merge branch 'rj/platform-pread-may-be-thread-unsafe'Junio C Hamano2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | index-pack: Disable threading on cygwinJunio C Hamano2012-06-26
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | config: write to $XDG_CONFIG_HOME/git/config file when appropriateHuynh Khoi Nguyen Nguyen2012-06-25
| * | | | | | | config: read (but not write) from $XDG_CONFIG_HOME/git/config fileHuynh Khoi Nguyen Nguyen2012-06-25
* | | | | | | | Merge branch 'nd/clone-single-fix'Junio C Hamano2012-07-04
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: fix ref selection in --single-branch --branch=xxxNguyễn Thái Ngọc Duy2012-06-22
| * | | | | | | | Merge branch 'js/maint-fast-export-mark-error' into maintJunio C Hamano2012-06-17
* | | | | | | | | Merge branch 'hv/submodule-update-nuke-submodules'Junio C Hamano2012-06-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update-index: allow overwriting existing submodule index entriesHeiko Voigt2012-06-11
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/stream-pack-objects'Junio C Hamano2012-06-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: use streaming interface for reading large loose blobsNguyễn Thái Ngọc Duy2012-05-29
* | | | | | | | | | Merge branch 'nd/stream-index-pack'Junio C Hamano2012-06-28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | index-pack: use streaming interface for collision test on large blobsNguyễn Thái Ngọc Duy2012-05-24
| * | | | | | | | | | index-pack: factor out unpack core from get_data_from_packNguyễn Thái Ngọc Duy2012-05-23
| * | | | | | | | | | index-pack: use streaming interface on large blobs (most of the time)Nguyễn Thái Ngọc Duy2012-05-23