aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/read-tree-empty'Junio C Hamano2010-09-29
|\
| * read-tree: deprecate syntax without tree-ish argsJan Krüger2010-09-10
* | Merge branch 'rr/format-patch-count-without-merges'Junio C Hamano2010-09-29
|\ \
| * | format-patch: Don't go over merge commitsRamkumar Ramachandra2010-08-27
* | | Merge branch 'rr/fmt-merge-msg'Junio C Hamano2010-09-29
|\ \ \
| * | | merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra2010-09-09
| * | | merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-09
| * | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra2010-09-09
* | | | Improvements to `git checkout -h`Daniel Knittl-Frank2010-09-27
* | | | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Junio C Hamano2010-09-15
|\ \ \ \ | |_|_|/ |/| | |
| * | | ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano2010-09-12
| * | | revert: Fix trivial comment style issueElijah Newren2010-09-06
* | | | builtin/fetch.c: comment that branch->remote_name is usable when has_mergeBrandon Casey2010-09-09
* | | | Merge branch 'jh/error-removing-missing-note'Junio C Hamano2010-09-08
|\ \ \ \
| * | | | notes: Don't create (empty) commit when removing non-existing notesJohan Herland2010-08-31
* | | | | Merge branch 'bc/maint-fetch-url-only'Junio C Hamano2010-09-08
|\ \ \ \ \
| * | | | | builtin/fetch.c: ignore merge config when not fetching from branch's remoteBrandon Casey2010-08-25
| | |_|_|/ | |/| | |
* | | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-09-08
|\ \ \ \ \
| * | | | | fast-export: ensure that a renamed file is printed after all referencesJohannes Sixt2010-09-08
* | | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-09-06
|\ \ \ \ \ \
| * | | | | | builtin/clean.c: Use STRING_LIST_INIT_NODUP.Thiago Farina2010-09-06
* | | | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-09-04
|\ \ \ \ \ \ \
| * | | | | | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann2010-08-30
| * | | | | | | checkout: respect diff.ignoreSubmodules settingJohannes Schindelin2010-08-25
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \