aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano2010-12-09
|\
| * cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-10
* | Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano2010-12-09
|\ \
| * | Fix git-apply with -p greater than 1Federico Cuello2010-11-05
| |/
* | Merge branch 'np/pack-broken-boundary' into maintJunio C Hamano2010-12-09
|\ \
| * | make pack-objects a bit more resilient to repo corruptionNicolas Pitre2010-10-22
| |/
* | Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano2010-12-09
|\ \
| * | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-10
| * | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-13
* | | Merge branch 'cb/maint-orphan-merge-noclobber' into maintJunio C Hamano2010-12-02
|\ \ \
| * | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-15
* | | | Merge branch 'tr/maint-merge-file-subdir' into maintJunio C Hamano2010-12-02
|\ \ \ \
| * | | | merge-file: correctly find files when called in subdirThomas Rast2010-10-18
* | | | | Merge branch 'ks/no-textconv-symlink' into maintJunio C Hamano2010-12-02
|\ \ \ \ \
| * | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-29
* | | | | | Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-01
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-01
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-01
* | | | | | | Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-24
|\ \ \ \ \ \ \
| * | | | | | | apply: don't segfault on binary files with missing dataJeff King2010-10-29
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-24
|\ \ \ \ \ \ \
| * | | | | | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-18
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-24
|\ \ \ \ \ \ \
| * | | | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-13
| |/ / / / / /
* | | | | | | Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano2010-11-24
|\ \ \ \ \ \ \
| * | | | | | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-27
| | |/ / / / / | |/| | | | |
* | | | | | | clean: remove redundant variable baselenNguyễn Thái Ngọc Duy2010-11-17
* | | | | | | clean: avoid quoting twiceNguyễn Thái Ngọc Duy2010-11-16
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix {update,checkout}-index usage stringsŠtěpán Němec2010-10-08
* | | | | | Put a space between `<' and argument in pack-objects usage stringŠtěpán Němec2010-10-08
* | | | | | Use parentheses and `...' where appropriateŠtěpán Němec2010-10-08
* | | | | | Use angles for placeholders consistentlyŠtěpán Němec2010-10-08
| |/ / / / |/| | | |
* | | | | do not depend on signed integer overflowErik Faye-Lund2010-10-06
* | | | | init: plug tiny one-time memory leakJonathan Nieder2010-10-06
* | | | | Fix typo in pack-objects' usageJohannes Schindelin2010-09-30
* | | | | 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