summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-0318-170/+785
|\
| * merge-recursive --renormalizeJonathan Nieder2010-08-068-8/+45
| * rerere: never renormalizeJonathan Nieder2010-08-061-6/+5
| * rerere: migrate to parse-options APIJonathan Nieder2010-08-062-24/+119
| * t4200 (rerere): modernize styleJonathan Nieder2010-08-061-125/+180
| * ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-065-8/+19
| * ll-merge: make flag easier to populateJonathan Nieder2010-08-064-9/+28
| * Documentation/technical: document ll_mergeJonathan Nieder2010-08-061-0/+70
| * merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-062-1/+3
| * merge-trees: push choice to renormalize away from low levelJonathan Nieder2010-08-061-4/+5
| * t6038 (merge.renormalize): check that it can be turned offJonathan Nieder2010-08-061-1/+49
| * t6038 (merge.renormalize): try checkout -m and cherry-pickJonathan Nieder2010-08-061-0/+41
| * t6038 (merge.renormalize): style nitpicksJonathan Nieder2010-08-061-8/+44
| * Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen2010-07-021-7/+20
| * Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-022-3/+50
| * Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-028-2/+143
* | Sync with 1.7.2.3Junio C Hamano2010-09-033-9/+6
|\ \
| * | Git 1.7.2.3v1.7.2.3Junio C Hamano2010-09-033-9/+3
| * | builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-031-1/+4
* | | t7406 & t7407: add missing && at end of linesJens Lehmann2010-09-032-3/+3
* | | t7405: cd inside subshell instead of aroundJens Lehmann2010-09-031-11/+6
* | | Prepare for 1.7.3Junio C Hamano2010-09-012-1/+74
* | | Merge branch 'maint'Junio C Hamano2010-09-012-1/+47
|\ \ \ | |/ /
| * | Prepare for 1.7.2.3Junio C Hamano2010-09-012-1/+47
| * | Merge branch 'gp/pack-refs-remove-empty-dirs' into maintJunio C Hamano2010-09-012-0/+38
| |\ \
| * \ \ Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano2010-09-014-11/+41
| |\ \ \
| * \ \ \ Merge branch 'np/maint-huge-delta-generation' into maintJunio C Hamano2010-09-011-1/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano2010-09-014-7/+56
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'da/fix-submodule-sync-superproject-config' into maintJunio C Hamano2010-09-012-1/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'en/rebase-against-rebase-fix' into maintJunio C Hamano2010-09-012-0/+71
| |\ \ \ \ \ \ \
* | | | | | | | | install-webdoc: filter timestamp-only changes correctlyJunio C Hamano2010-09-011-1/+1
* | | | | | | | | Merge branch 'np/maint-huge-delta-generation'Junio C Hamano2010-08-311-1/+8
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | fix >4GiB source delta assertion failureNicolas Pitre2010-08-211-1/+8
* | | | | | | | | Merge branch 'da/fix-submodule-sync-superproject-config'Junio C Hamano2010-08-312-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | submodule sync: Update "submodule.<name>.url"David Aguilar2010-08-182-1/+5
* | | | | | | | | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-316-84/+152
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: fix syntax error in "Use advise() for hints" testÆvar Arnfjörð Bjarmason2010-08-181-5/+5
| * | | | | | | | | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-153-26/+34
| * | | | | | | | | cherry-pick/revert: Use error() for failure messageJonathan Nieder2010-08-151-2/+5
| * | | | | | | | | Introduce advise() to print hintsJonathan Nieder2010-08-151-0/+9
| * | | | | | | | | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-154-21/+30
| * | | | | | | | | t3508: add check_head_differs_from() helper function and use itChristian Couder2010-07-231-5/+17
| * | | | | | | | | revert: improve success message by adding abbreviated commit sha1Christian Couder2010-07-162-10/+11
| * | | | | | | | | revert: don't print "Finished one cherry-pick." if commit failedChristian Couder2010-07-161-12/+5
| * | | | | | | | | revert: refactor commit code into a new run_git_commit() functionChristian Couder2010-07-161-25/+27
| * | | | | | | | | revert: report success when using option --strategyChristian Couder2010-07-162-23/+54
* | | | | | | | | | Merge branch 'cb/binary-patch-id'Junio C Hamano2010-08-311-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | hash binary sha1 into patch idClemens Buchacher2010-08-161-0/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Junio C Hamano2010-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reset: suggest what to do upon "git reset --mixed <paths>"Ævar Arnfjörð Bjarmason2010-08-211-1/+1
View Lorry Controller Status