aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cw/amend-commit-without-message'Junio C Hamano2012-07-15
|\
| * Allow edit of empty message with commit --amendChris Webb2012-07-09
* | Merge branch 'jn/makefile-cleanup'Junio C Hamano2012-07-15
|\ \
| * | Makefile: document ground rules for target-specific dependenciesJonathan Nieder2012-07-09
| * | Makefile: move GIT-VERSION-FILE dependencies closer to useJeff King2012-07-09
| * | Makefile: build instaweb similar to other scriptsJeff King2012-07-09
| * | Makefile: update scripts when build-time parameters changeJeff King2012-07-09
| * | Makefile: do not replace @@GIT_VERSION@@ in shell scriptsJeff King2012-07-09
| * | Makefile: split prefix flags from GIT-CFLAGSJeff King2012-07-09
| * | Makefile: be silent when only GIT_USER_AGENT changesJonathan Nieder2012-07-09
| * | Makefile: split GIT_USER_AGENT from GIT-CFLAGSJeff King2012-07-09
| * | Makefile: do not replace @@GIT_USER_AGENT@@ in scriptsJeff King2012-07-09
| * | Makefile: apply dependencies consistently to sparse/asm targetsJeff King2012-07-09
| * | Makefile: do not have git.o depend on common-cmds.hJeff King2012-07-09
| * | Makefile: fold XDIFF_H and VCSSVN_H into LIB_HJonathan Nieder2012-07-09
| * | Makefile: fold MISC_H into LIB_HJeff King2012-06-20
| * | Makefile: sort LIB_H listJeff King2012-06-20
* | | Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-15
|\ \ \
| * | | add: create ADD_EDIT.patch with mode 0666Jeff King2012-07-09
| * | | rerere: make rr-cache fanout directory honor umaskJunio C Hamano2012-07-09
| * | | Restore umasks influence on the permissions of work tree created by cloneAlex Riesen2012-07-09
| | |/ | |/|
* | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-15
|\ \ \
| * | | apply: tests for the --3way optionJunio C Hamano2012-07-09
| * | | apply: document --3way optionJunio C Hamano2012-07-09
| * | | 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 'cw/rebase-i-root'Junio C Hamano2012-07-15
|\ \ \ \
| * | | | t3404: make test 57 work with dash and othersMichael J Gruber2012-07-05
| * | | | Add tests for rebase -i --root without --ontoChris Webb2012-06-26
| * | | | rebase -i: support --root without --ontoChris Webb2012-06-26
* | | | | Merge branch 'pw/git-p4-move'Junio C Hamano2012-07-15
|\ \ \ \ \
| * | | | | git p4: add support for 'p4 move' in P4SubmitGary Gibbons2012-07-12
| * | | | | git p4: refactor diffOpts calculationGary Gibbons2012-07-05
* | | | | | Merge branch 'pw/git-p4-jobs'Junio C Hamano2012-07-13
|\ \ \ \ \ \
| * | | | | | git p4: notice Jobs lines in git commit messagesPete Wyckoff2012-07-05