| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/maint-commit-amend-only-no-paths' | Junio C Hamano | 2012-07-15 | 2 | -1/+14 |
|\ |
|
| * | commit: fix "--amend --only" with no pathspec | Jeff King | 2012-07-10 | 2 | -1/+14 |
* | | Merge branch 'cw/amend-commit-without-message' | Junio C Hamano | 2012-07-15 | 2 | -1/+16 |
|\ \ |
|
| * | | Allow edit of empty message with commit --amend | Chris Webb | 2012-07-09 | 2 | -1/+16 |
* | | | Merge branch 'jn/makefile-cleanup' | Junio C Hamano | 2012-07-15 | 2 | -102/+131 |
|\ \ \ |
|
| * | | | Makefile: document ground rules for target-specific dependencies | Jonathan Nieder | 2012-07-09 | 1 | -0/+33 |
| * | | | Makefile: move GIT-VERSION-FILE dependencies closer to use | Jeff King | 2012-07-09 | 1 | -9/+4 |
| * | | | Makefile: build instaweb similar to other scripts | Jeff King | 2012-07-09 | 1 | -8/+6 |
| * | | | Makefile: update scripts when build-time parameters change | Jeff King | 2012-07-09 | 2 | -3/+14 |
| * | | | Makefile: do not replace @@GIT_VERSION@@ in shell scripts | Jeff King | 2012-07-09 | 1 | -3/+0 |
| * | | | Makefile: split prefix flags from GIT-CFLAGS | Jeff King | 2012-07-09 | 2 | -8/+23 |
| * | | | Makefile: be silent when only GIT_USER_AGENT changes | Jonathan Nieder | 2012-07-09 | 1 | -1/+0 |
| * | | | Makefile: split GIT_USER_AGENT from GIT-CFLAGS | Jeff King | 2012-07-09 | 2 | -2/+10 |
| * | | | Makefile: do not replace @@GIT_USER_AGENT@@ in scripts | Jeff King | 2012-07-09 | 1 | -1/+0 |
| * | | | Makefile: apply dependencies consistently to sparse/asm targets | Jeff King | 2012-07-09 | 1 | -2/+2 |
| * | | | Makefile: do not have git.o depend on common-cmds.h | Jeff King | 2012-07-09 | 1 | -1/+0 |
| * | | | Makefile: fold XDIFF_H and VCSSVN_H into LIB_H | Jonathan Nieder | 2012-07-09 | 1 | -37/+25 |
| * | | | Makefile: fold MISC_H into LIB_H | Jeff King | 2012-06-20 | 1 | -29/+16 |
| * | | | Makefile: sort LIB_H list | Jeff King | 2012-06-20 | 1 | -4/+4 |
* | | | | Merge branch 'ar/clone-honor-umask-at-top' | Junio C Hamano | 2012-07-15 | 3 | -3/+3 |
|\ \ \ \ |
|
| * | | | | add: create ADD_EDIT.patch with mode 0666 | Jeff King | 2012-07-09 | 1 | -1/+1 |
| * | | | | rerere: make rr-cache fanout directory honor umask | Junio C Hamano | 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 | 4 | -118/+615 |
|\ \ \ \ |
|
| * | | | | apply: tests for the --3way option | Junio C Hamano | 2012-07-09 | 1 | -0/+54 |
| * | | | | apply: document --3way option | Junio C Hamano | 2012-07-09 | 1 | -1/+10 |
| * | | | | apply: allow rerere() to work on --3way results | Junio C Hamano | 2012-07-09 | 2 | -0/+28 |
| * | | | | apply: register conflicted stages to the index | Junio C Hamano | 2012-07-09 | 2 | -6/+138 |
| * | | | | 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 | 2 | -2/+31 |
| * | | | | 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 'cw/rebase-i-root' | Junio C Hamano | 2012-07-15 | 5 | -17/+74 |
|\ \ \ \ \ |
|
| * | | | | | t3404: make test 57 work with dash and others | Michael J Gruber | 2012-07-05 | 1 | -1/+5 |
| * | | | | | Add tests for rebase -i --root without --onto | Chris Webb | 2012-06-26 | 2 | -4/+27 |
| * | | | | | rebase -i: support --root without --onto | Chris Webb | 2012-06-26 | 3 | -12/+43 |
* | | | | | | Merge branch 'pw/git-p4-move' | Junio C Hamano | 2012-07-15 | 3 | -40/+72 |
|\ \ \ \ \ \ |
|
| * | | | | | | git p4: add support for 'p4 move' in P4Submit | Gary Gibbons | 2012-07-12 | 2 | -16/+34 |
| * | | | | | | git p4: refactor diffOpts calculation | Gary Gibbons | 2012-07-05 | 2 | -24/+38 |