summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* thread-utils.h: simplify the inclusionJunio C Hamano2010-12-102-8/+0
* Merge branch 'nd/maint-fix-add-typo-detection' (early part)Junio C Hamano2010-12-081-1/+2
|\
| * add: do not rely on dtype being NULL behaviorNguyễn Thái Ngọc Duy2010-11-131-1/+2
* | Merge branch 'il/remote-fd-ext'Junio C Hamano2010-12-082-0/+325
|\ \
| * | remote-fd/ext: finishing touches after code reviewIlari Liusvaara2010-11-192-8/+6
| * | git-remote-extIlari Liusvaara2010-10-141-0/+248
| * | git-remote-fdIlari Liusvaara2010-10-141-0/+79
* | | Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano2010-12-082-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 'jh/notes-merge'Junio C Hamano2010-12-082-50/+265
|\ \ \
| * | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-0/+14
| * | | cmd_merge(): Parse options before checking MERGE_HEADJohan Herland2010-11-171-16/+17
| * | | Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-171-0/+23
| * | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-2/+6
| * | | git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-171-2/+9
| * | | git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-1/+1
| * | | git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-3/+103
| * | | git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-4/+4
| * | | git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-1/+20
| * | | git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-5/+10
| * | | builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-171-23/+5
| * | | git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+54
| * | | builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-171-6/+11
| * | | notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-171-5/+6
* | | | Merge branch 'jn/thinner-wrapper'Junio C Hamano2010-12-041-1/+1
|\ \ \ \
| * | | | pack-objects: mark file-local variable staticJonathan Nieder2010-11-101-1/+1
* | | | | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-043-30/+56
|\ \ \ \ \
| * | | | | commit: --squash option for use with rebase --autosquashPat Notz2010-11-041-2/+33
| * | | | | commit: --fixup option for use with rebase --autosquashPat Notz2010-11-041-4/+18
| * | | | | commit: helper methods to reduce redundant blocks of codePat Notz2010-11-043-25/+6
* | | | | | Merge branch 'sn/diff-doc'Junio C Hamano2010-12-041-1/+1
|\ \ \ \ \ \
| * | | | | | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-051-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'maint'Junio C Hamano2010-12-021-1/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-021-1/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-021-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-021-1/+2
| * | | | | | | | Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-241-0/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-241-2/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/clone-recurse-sm-synonym'Junio C Hamano2010-11-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: Add the --recurse-submodules option as alias for --recursiveJens Lehmann2010-11-051-0/+2
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano2010-11-301-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-2/+16
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'np/pack-broken-boundary'Junio C Hamano2010-11-301-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | make pack-objects a bit more resilient to repo corruptionNicolas Pitre2010-10-221-1/+15
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano2010-11-301-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix git-apply with -p greater than 1Federico Cuello2010-11-051-14/+14
| |/ / / / / / / / / / / /