aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| * | | | git p4 test: refactor marshal_dumpPete Wyckoff2012-07-05
| * | | | git p4: remove unused P4Submit interactive settingPete Wyckoff2012-07-05
| |/ / /
* | | | Merge branch 'jk/push-delete-ref-error-message'Junio C Hamano2012-07-13
|\ \ \ \
| * | | | push: don't guess at qualifying remote refs on deletionJeff King2012-07-03
* | | | | Sixth batch for 1.7.12Junio C Hamano2012-07-13
* | | | | Merge branch 'jc/refactor-diff-stdin'Junio C Hamano2012-07-13
|\ \ \ \ \
| * | | | | diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano2012-06-28
| * | | | | diff-index.c: unify handling of command line pathsJunio C Hamano2012-06-28
| * | | | | diff-index.c: do not pretend paths are pathspecsJunio C Hamano2012-06-28
* | | | | | Merge branch 'tg/ce-namelen'Junio C Hamano2012-07-13
|\ \ \ \ \ \
| * | | | | | Replace strlen() with ce_namelen()Thomas Gummerer2012-07-08
* | | | | | | 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 'mm/mediawiki-tests'Junio C Hamano2012-07-13
|\ \ \ \ \ \ \ \
| * | | | | | | | git-remote-mediawiki: be more defensive when requests failMatthieu Moy2012-07-06
| * | | | | | | | git-remote-mediawiki: more efficient 'pull' in the best caseMatthieu Moy2012-07-06
| * | | | | | | | git-remote-mediawiki: extract revision-importing loop to a functionMatthieu Moy2012-07-06
| * | | | | | | | git-remote-mediawiki: refactor loop over revision idsMatthieu Moy2012-07-06
| * | | | | | | | git-remote-mediawiki: change return type of get_mw_pagesMatthieu Moy2012-07-06
| * | | | | | | | git-remote-mediawiki (t9363): test 'File:' import and exportNGUYEN Kim Thuat2012-07-06
| * | | | | | | | git-remote-mediawiki: support for uploading file in test environmentMatthieu Moy2012-07-06