summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* commit: die before asking to edit the log messageJunio C Hamano2010-12-201-22/+32
* Merge branch 'mg/maint-tag-rfc1991' into maintJunio C Hamano2010-12-102-20/+6
|\
| * tag: factor out sig detection for tag displayMichael J Gruber2010-11-101-2/+2
| * tag: factor out sig detection for body editsMichael J Gruber2010-11-101-10/+2
| * verify-tag: factor out signature detectionMichael J Gruber2010-11-101-8/+2
* | Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano2010-12-091-2/+16
|\ \
| * | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-2/+16
| |/
* | Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano2010-12-091-14/+14
|\ \
| * | Fix git-apply with -p greater than 1Federico Cuello2010-11-051-14/+14
| |/
* | Merge branch 'np/pack-broken-boundary' into maintJunio C Hamano2010-12-091-1/+15
|\ \
| * | make pack-objects a bit more resilient to repo corruptionNicolas Pitre2010-10-221-1/+15
| |/
* | Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano2010-12-091-6/+29
|\ \
| * | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-101-2/+22
| * | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-131-4/+7
* | | Merge branch 'cb/maint-orphan-merge-noclobber' into maintJunio C Hamano2010-12-021-1/+19
|\ \ \
| * | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-151-1/+19
* | | | Merge branch 'tr/maint-merge-file-subdir' into maintJunio C Hamano2010-12-021-1/+6
|\ \ \ \
| * | | | merge-file: correctly find files when called in subdirThomas Rast2010-10-181-1/+6
* | | | | Merge branch 'ks/no-textconv-symlink' into maintJunio C Hamano2010-12-022-12/+23
|\ \ \ \ \
| * | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-292-12/+23
* | | | | | Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-011-1/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-011-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-011-1/+2
* | | | | | | Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-241-0/+6
|\ \ \ \ \ \ \
| * | | | | | | apply: don't segfault on binary files with missing dataJeff King2010-10-291-0/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-181-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-241-2/+4
|\ \ \ \ \ \ \
| * | | | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-131-2/+4
| |/ / / / / /
* | | | | | | Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano2010-11-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-271-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | clean: remove redundant variable baselenNguyễn Thái Ngọc Duy2010-11-171-2/+2
* | | | | | | clean: avoid quoting twiceNguyễn Thái Ngọc Duy2010-11-161-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix {update,checkout}-index usage stringsŠtěpán Němec2010-10-082-2/+2
* | | | | | Put a space between `<' and argument in pack-objects usage stringŠtěpán Němec2010-10-081-1/+1
* | | | | | Use parentheses and `...' where appropriateŠtěpán Němec2010-10-088-8/+8
* | | | | | Use angles for placeholders consistentlyŠtěpán Němec2010-10-086-12/+12
| |/ / / / |/| | | |
* | | | | do not depend on signed integer overflowErik Faye-Lund2010-10-063-3/+3
* | | | | init: plug tiny one-time memory leakJonathan Nieder2010-10-061-13/+19
* | | | | Fix typo in pack-objects' usageJohannes Schindelin2010-09-301-1/+1
* | | | | Improvements to `git checkout -h`Daniel Knittl-Frank2010-09-271-6/+6
|/ / / /
* | | | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Junio C Hamano2010-09-151-0/+2
|\ \ \ \
| * | | | ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano2010-09-121-0/+2
| |/ / /
| * | | revert: Fix trivial comment style issueElijah Newren2010-09-061-1/+0
* | | | 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
|\ \ \ \ \ \