aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-03
|\
| * Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-03
| * setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-03
| * Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03
* | Merge branch 'nd/clone-depth-zero'Junio C Hamano2010-09-03
|\ \
| * | clone: warn users --depth is ignored in local clonesNguyễn Thái Ngọc Duy2010-08-24
* | | Merge branch 'jn/apply-filename-with-sp'Junio C Hamano2010-09-03
|\ \ \
| * | | apply: handle traditional patches with space in filenameJonathan Nieder2010-08-21
| * | | apply: split quoted filename handling into new functionJonathan Nieder2010-08-21
* | | | Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2010-09-03
|\ \ \ \
| * | | | merge: let custom strategies intervene in trivial mergesJonathan Nieder2010-08-15
| |/ / /
* | | | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-03
|\ \ \ \
| * | | | fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-18
| * | | | merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-18
| * | | | merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-18
| * | | | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-18
| |/ / /
* | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\ \ \ \
| * | | | merge-recursive --renormalizeJonathan Nieder2010-08-06
| * | | | rerere: migrate to parse-options APIJonathan Nieder2010-08-06
| * | | | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-06
| * | | | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-02
* | | | | Sync with 1.7.2.3Junio C Hamano2010-09-03
|\ \ \ \ \
| * | | | | builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-03
| * | | | | Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano2010-09-01
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano2010-09-01
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-31
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-15
| * | | | | | | | cherry-pick/revert: Use error() for failure messageJonathan Nieder2010-08-15
| * | | | | | | | Introduce advise() to print hintsJonathan Nieder2010-08-15
| * | | | | | | | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-15
| * | | | | | | | revert: improve success message by adding abbreviated commit sha1Christian Couder2010-07-16
| * | | | | | | | revert: don't print "Finished one cherry-pick." if commit failedChristian Couder2010-07-16
| * | | | | | | | revert: refactor commit code into a new run_git_commit() functionChristian Couder2010-07-16
| * | | | | | | | revert: report success when using option --strategyChristian Couder2010-07-16
* | | | | | | | | Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Junio C Hamano2010-08-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reset: suggest what to do upon "git reset --mixed <paths>"Ævar Arnfjörð Bjarmason2010-08-21
* | | | | | | | | | Merge branch 'dj/fetch-tagopt'Junio C Hamano2010-08-31
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | fetch: allow command line --tags to override configDaniel Johnson2010-08-14
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-export: Fix output order of D/F changesElijah Newren2010-07-09
* | | | | | | | | | Merge branch 'jn/paginate-fix'Junio C Hamano2010-08-31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-file: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
| * | | | | | | | | | var: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
| * | | | | | | | | | ls-remote: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
| * | | | | | | | | | index-pack: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
| * | | | | | | | | | Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fixJunio C Hamano2010-08-15
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
| * | | | | | | | | | | bundle: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
| * | | | | | | | | | | apply: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
| * | | | | | | | | | | grep: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-11