| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 4 | -12/+6 |
| |\ | |||||
| | * | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 4 | -12/+6 |
| * | | Merge branch 'pg/maint-apply-remove-unused-variable' | Junio C Hamano | 2012-08-22 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | apply: delete unused deflate_origlen from patch struct | Paul Gortmaker | 2012-08-05 | 1 | -1/+0 |
| * | | | Merge branch 'jk/maint-checkout-orphan-check-fix' | Junio C Hamano | 2012-07-27 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | checkout: don't confuse ref and object flags | Jeff King | 2012-07-25 | 1 | -1/+1 |
| * | | | | Merge branch 'jk/maint-commit-check-committer-early' | Junio C Hamano | 2012-07-24 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | commit: check committer identity more strictly | Jeff King | 2012-07-23 | 1 | -1/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'kk/maint-commit-tree' | Junio C Hamano | 2012-07-23 | 1 | -3/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree | Junio C Hamano | 2012-07-17 | 1 | -3/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | commit-tree: resurrect command line parsing updates | Junio C Hamano | 2012-07-17 | 1 | -3/+0 |
| * | | | | | | Merge branch 'tg/ce-namelen-field' | Junio C Hamano | 2012-07-23 | 4 | -7/+14 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Strip namelen out of ce_flags into a ce_namelen field | Thomas Gummerer | 2012-07-11 | 4 | -6/+12 |
| * | | | | | | | Merge branch 'mm/config-xdg' | Junio C Hamano | 2012-07-22 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | config: fix several access(NULL) calls | Matthieu Moy | 2012-07-16 | 1 | -4/+12 |
| * | | | | | | | | Merge branch 'jc/sha1-name-more' | Junio C Hamano | 2012-07-22 | 7 | -11/+30 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | rev-parse --disambiguate=<prefix> | Junio C Hamano | 2012-07-09 | 1 | -0/+10 |
| | * | | | | | | | | rev-parse: A and B in "rev-parse A..B" refer to committish | Junio C Hamano | 2012-07-09 | 1 | -2/+2 |
| | * | | | | | | | | reset: the command takes committish | Junio C Hamano | 2012-07-09 | 1 | -2/+8 |
| | * | | | | | | | | commit-tree: the command wants a tree and commits | Junio C Hamano | 2012-07-09 | 1 | -4/+4 |
| | * | | | | | | | | apply: --build-fake-ancestor expects blobs | Junio C Hamano | 2012-07-09 | 1 | -1/+1 |
| | * | | | | | | | | revision.c: the "log" family, except for "show", takes committish | Junio C Hamano | 2012-07-09 | 1 | -0/+3 |
| | * | | | | | | | | revision.c: allow handle_revision_arg() to take other flags | Junio C Hamano | 2012-07-09 | 1 | -1/+1 |
| | * | | | | | | | | sha1_name.c: teach lookup context to get_sha1_with_context() | Junio C Hamano | 2012-07-09 | 1 | -1/+1 |
| * | | | | | | | | | 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 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |