summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* builtin/fetch.c: comment that branch->remote_name is usable when has_mergeBrandon Casey2010-09-091-0/+3
* Merge branch 'jh/error-removing-missing-note'Junio C Hamano2010-09-081-4/+10
|\
| * notes: Don't create (empty) commit when removing non-existing notesJohan Herland2010-08-311-4/+10
* | Merge branch 'bc/maint-fetch-url-only'Junio C Hamano2010-09-081-1/+3
|\ \
| * | builtin/fetch.c: ignore merge config when not fetching from branch's remoteBrandon Casey2010-08-251-1/+3
* | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-09-081-1/+9
|\ \ \
| * | | fast-export: ensure that a renamed file is printed after all referencesJohannes Sixt2010-09-081-1/+9
* | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-09-061-1/+1
|\ \ \ \
| * | | | builtin/clean.c: Use STRING_LIST_INIT_NODUP.Thiago Farina2010-09-061-1/+1
* | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-09-041-4/+17
|\ \ \ \ \
| * | | | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann2010-08-301-0/+5
| * | | | | checkout: respect diff.ignoreSubmodules settingJohannes Schindelin2010-08-251-4/+12
* | | | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-032-4/+2
|\ \ \ \ \ \
| * | | | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-032-2/+0
| * | | | | | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-032-2/+2
| * | | | | | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-032-2/+2
* | | | | | | Merge branch 'nd/clone-depth-zero'Junio C Hamano2010-09-031-2/+5
|\ \ \ \ \ \ \
| * | | | | | | clone: warn users --depth is ignored in local clonesNguyễn Thái Ngọc Duy2010-08-241-2/+5
* | | | | | | | Merge branch 'jn/apply-filename-with-sp'Junio C Hamano2010-09-031-38/+211
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: handle traditional patches with space in filenameJonathan Nieder2010-08-211-14/+179
| * | | | | | | | apply: split quoted filename handling into new functionJonathan Nieder2010-08-211-30/+38
* | | | | | | | | Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2010-09-031-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: let custom strategies intervene in trivial mergesJonathan Nieder2010-08-151-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-033-6/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-181-2/+16
| * | | | | | | | | merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-181-6/+15
| * | | | | | | | | merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-181-3/+32
| * | | | | | | | | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-181-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-035-26/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-recursive --renormalizeJonathan Nieder2010-08-064-5/+32
| * | | | | | | | | rerere: migrate to parse-options APIJonathan Nieder2010-08-061-24/+28
| * | | | | | | | | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-061-0/+4
| * | | | | | | | | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+3
* | | | | | | | | | Sync with 1.7.2.3Junio C Hamano2010-09-031-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-031-1/+4
| * | | | | | | | | | Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano2010-09-011-5/+16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano2010-09-011-4/+6
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-311-69/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-151-23/+11
| * | | | | | | | | | | | | 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-151-2/+0
| * | | | | | | | | | | | | revert: improve success message by adding abbreviated commit sha1Christian Couder2010-07-161-2/+3
| * | | | | | | | | | | | | 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-161-22/+29
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge branch 'dj/fetch-tagopt'Junio C Hamano2010-08-311-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | fetch: allow command line --tags to override configDaniel Johnson2010-08-141-4/+6
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
View Lorry Controller Status