summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-311-0/+29
|\ \ \ \ \ \ \
| * | | | | | | fast-export: Fix output order of D/F changesElijah Newren2010-07-091-0/+29
* | | | | | | | Merge branch 'jn/paginate-fix'Junio C Hamano2010-08-319-31/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-file: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+1
| * | | | | | | | var: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-7/+2
| * | | | | | | | ls-remote: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+0
| * | | | | | | | index-pack: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-2/+0
| * | | | | | | | Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fixJunio C Hamano2010-08-151-19/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | config: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+2
| * | | | | | | | | bundle: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-4/+2
| * | | | | | | | | apply: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+3
| * | | | | | | | | grep: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-111-4/+2
| * | | | | | | | | shortlog: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-111-2/+1
* | | | | | | | | | Merge branch 'jn/maint-setup-fix'Junio C Hamano2010-08-311-19/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Revert "rehabilitate 'git index-pack' inside the object store"Nguyễn Thái Ngọc Duy2010-08-041-19/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'en/fast-export-fix'Junio C Hamano2010-08-311-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-export: Add a --full-tree optionElijah Newren2010-07-191-1/+3
| * | | | | | | | | fast-export: Fix dropping of files with --import-marks and path limitingElijah Newren2010-07-191-1/+8
* | | | | | | | | | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-08-311-5/+16
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | rerere: fix overeager gcSZEDER Gábor2010-07-141-5/+16
* | | | | | | | | | object.h: Add OBJECT_ARRAY_INIT macro and make use of it.Thiago Farina2010-08-293-3/+3
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-262-7/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | for-each-ref: fix objectname:short bugJay Soffian2010-08-261-1/+2
View Lorry Controller Status