Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/index-pack-streaming-fix' | Junio C Hamano | 2012-07-15 | 1 | -10/+13 |
|\ | |||||
| * | index-pack: loop while inflating objects in unpack_data | Jeff King | 2012-07-10 | 1 | -10/+13 |
* | | Merge branch 'jk/maint-commit-amend-only-no-paths' | Junio C Hamano | 2012-07-15 | 1 | -1/+4 |
* | | Merge branch 'cw/amend-commit-without-message' | Junio C Hamano | 2012-07-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | Allow edit of empty message with commit --amend | Chris Webb | 2012-07-09 | 1 | -1/+1 |
* | | | Merge branch 'ar/clone-honor-umask-at-top' | Junio C Hamano | 2012-07-15 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | add: create ADD_EDIT.patch with mode 0666 | Jeff King | 2012-07-09 | 1 | -1/+1 |
| * | | | Restore umasks influence on the permissions of work tree created by clone | Alex Riesen | 2012-07-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jc/apply-3way' | Junio C Hamano | 2012-07-15 | 1 | -117/+440 |
|\ \ \ | |||||
| * | | | apply: allow rerere() to work on --3way results | Junio C Hamano | 2012-07-09 | 1 | -0/+3 |
| * | | | apply: register conflicted stages to the index | Junio C Hamano | 2012-07-09 | 1 | -6/+60 |
| * | | | apply: --3way with add/add conflict | Junio C Hamano | 2012-07-09 | 1 | -8/+62 |
| * | | | apply: move verify_index_match() higher | Junio C Hamano | 2012-07-09 | 1 | -10/+10 |
| * | | | apply: plug the three-way merge logic in | Junio C Hamano | 2012-07-09 | 1 | -3/+50 |
| * | | | apply: fall back on three-way merge | Junio C Hamano | 2012-07-09 | 1 | -1/+45 |
| * | | | apply: accept -3/--3way command line option | Junio C Hamano | 2012-07-09 | 1 | -2/+23 |
| * | | | apply: move "already exists" logic to check_to_create() | Junio C Hamano | 2012-07-09 | 1 | -11/+29 |
| * | | | apply: move check_to_create_blob() closer to its sole caller | Junio C Hamano | 2012-07-09 | 1 | -23/+23 |
| * | | | apply: further split load_preimage() | Junio C Hamano | 2012-07-09 | 1 | -19/+40 |
| * | | | apply: refactor "previous patch" logic | Junio C Hamano | 2012-07-09 | 1 | -26/+56 |
| * | | | apply: split load_preimage() helper function out | Junio C Hamano | 2012-07-09 | 1 | -3/+12 |
| * | | | apply: factor out checkout_target() helper function | Junio C Hamano | 2012-07-09 | 1 | -7/+13 |
| * | | | apply: refactor read_file_or_gitlink() | Junio C Hamano | 2012-07-09 | 1 | -7/+11 |
| * | | | apply: clear_image() clears things a bit more | Junio C Hamano | 2012-07-09 | 1 | -2/+2 |
| * | | | apply: a bit more comments on PATH_TO_BE_DELETED | Junio C Hamano | 2012-07-09 | 1 | -2/+8 |
| * | | | apply: fix an incomplete comment in check_patch() | Junio C Hamano | 2012-07-09 | 1 | -9/+15 |
* | | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname' | Junio C Hamano | 2012-07-13 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | git on Mac OS and precomposed unicode | Torsten Bögershausen | 2012-07-08 | 1 | -0/+1 |
* | | | | | Merge branch 'tr/maint-show-walk' | Junio C Hamano | 2012-07-13 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | show: fix "range implies walking" | Junio C Hamano | 2012-06-19 | 1 | -0/+3 |
* | | | | | | Merge branch 'cw/help-over-network' | Junio C Hamano | 2012-07-09 | 1 | -4/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow help.htmlpath to be a URL prefix | Chris Webb | 2012-06-28 | 1 | -3/+5 |
| * | | | | | | Add config variable to set HTML path for git-help --web | Chris Webb | 2012-06-28 | 1 | -1/+10 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/fast-export-paths-with-spaces' | Junio C Hamano | 2012-07-09 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fast-export: quote paths with spaces | Jay Soffian | 2012-06-27 | 1 | -0/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'cw/no-detaching-an-unborn' | Junio C Hamano | 2012-07-09 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-checkout: disallow --detach on unborn branch | Chris Webb | 2012-06-26 | 1 | -0/+2 |
* | | | | | | | Merge branch 'mm/credential-plumbing' | Junio C Hamano | 2012-07-09 | 1 | -0/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git credential fill: output the whole 'struct credential' | Matthieu Moy | 2012-06-25 | 1 | -4/+1 |
| * | | | | | | | add 'git credential' plumbing command | Javier Roucher Iglesias | 2012-06-25 | 1 | -0/+34 |
* | | | | | | | | Merge branch 'jc/maint-blame-unique-abbrev' | Junio C Hamano | 2012-07-09 | 1 | -4/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | blame: compute abbreviation width that ensures uniqueness | Junio C Hamano | 2012-07-02 | 1 | -4/+21 |
* | | | | | | | | | Merge branch 'rj/platform-pread-may-be-thread-unsafe' | Junio C Hamano | 2012-07-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | index-pack: Disable threading on cygwin | Junio C Hamano | 2012-06-26 | 1 | -2/+2 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mm/config-xdg' | Junio C Hamano | 2012-07-09 | 1 | -9/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config: write to $XDG_CONFIG_HOME/git/config file when appropriate | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -4/+1 |
| * | | | | | | | | | config: read (but not write) from $XDG_CONFIG_HOME/git/config file | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -9/+19 |
* | | | | | | | | | | Merge branch 'nd/clone-single-fix' | Junio C Hamano | 2012-07-04 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clone: fix ref selection in --single-branch --branch=xxx | Nguyễn Thái Ngọc Duy | 2012-06-22 | 1 | -2/+5 |
| * | | | | | | | | | | Merge branch 'js/maint-fast-export-mark-error' into maint | Junio C Hamano | 2012-06-17 | 1 | -1/+1 |