summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-12-12Merge branch 'jn/git-cmd-h-bypass-setup'Libravatar Junio C Hamano7-0/+24
2010-12-10thread-utils.h: simplify the inclusionLibravatar Junio C Hamano2-8/+0
2010-12-08Merge branch 'nd/maint-fix-add-typo-detection' (early part)Libravatar Junio C Hamano1-1/+2
2010-12-08Merge branch 'il/remote-fd-ext'Libravatar Junio C Hamano2-0/+325
2010-12-08Merge branch 'mg/maint-tag-rfc1991'Libravatar Junio C Hamano2-20/+6
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano2-50/+265
2010-12-03Merge branch 'jn/thinner-wrapper'Libravatar Junio C Hamano1-1/+1
2010-12-03Merge branch 'pn/commit-autosquash'Libravatar Junio C Hamano3-30/+56
2010-12-03Merge branch 'sn/diff-doc'Libravatar Junio C Hamano1-1/+1
2010-12-01Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2010-12-01Merge branch 'maint-1.7.2' into maintLibravatar Junio C Hamano1-1/+2
2010-12-01Merge branch 'maint-1.7.1' into maint-1.7.2Libravatar Junio C Hamano1-1/+2
2010-12-01Merge branch 'maint-1.7.0' into maint-1.7.1Libravatar Junio C Hamano1-1/+2
2010-11-29Merge branch 'jl/clone-recurse-sm-synonym'Libravatar Junio C Hamano1-0/+2
2010-11-29Merge branch 'jn/cherry-pick-refresh-index'Libravatar Junio C Hamano1-2/+16
2010-11-29Merge branch 'np/pack-broken-boundary'Libravatar Junio C Hamano1-1/+15
2010-11-29Merge branch 'fc/apply-p2-get-header-name'Libravatar Junio C Hamano1-14/+14
2010-11-29Merge branch 'kb/blame-author-email'Libravatar Junio C Hamano1-6/+22
2010-11-29Merge branch 'ak/apply-non-git-epoch'Libravatar Junio C Hamano1-6/+29
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Libravatar Junio C Hamano1-1/+19
2010-11-24Merge branch 'rs/opt-help-text'Libravatar Junio C Hamano26-49/+48
2010-11-24Merge branch 'mm/phrase-remote-tracking'Libravatar Junio C Hamano5-12/+12
2010-11-24Merge branch 'jk/maint-apply-no-binary' into maintLibravatar Junio C Hamano1-0/+6
2010-11-24Merge branch 'jn/send-pack-error' into maintLibravatar Junio C Hamano1-1/+1
2010-11-24Merge branch 'jk/maint-rev-list-nul' into maintLibravatar Junio C Hamano1-2/+4
2010-11-24Merge branch 'bc/fix-cherry-pick-root' into maintLibravatar Junio C Hamano1-1/+1
2010-11-19remote-fd/ext: finishing touches after code reviewLibravatar Ilari Liusvaara2-8/+6
2010-11-17Merge branch 'jk/maint-apply-no-binary'Libravatar Junio C Hamano1-0/+6
2010-11-17Merge branch 'jk/push-progress'Libravatar Junio C Hamano1-0/+3
2010-11-17Merge branch 'tr/maint-merge-file-subdir'Libravatar Junio C Hamano1-1/+6
2010-11-17Merge branch 'jn/send-pack-error'Libravatar Junio C Hamano1-1/+1
2010-11-17Merge branch 'jk/maint-rev-list-nul'Libravatar Junio C Hamano1-2/+4
2010-11-17Merge branch 'ks/no-textconv-symlink'Libravatar Junio C Hamano2-12/+23
2010-11-17Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
2010-11-17clean: remove redundant variable baselenLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Libravatar Johan Herland1-0/+14
2010-11-17cmd_merge(): Parse options before checking MERGE_HEADLibravatar Johan Herland1-16/+17
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refLibravatar Johan Herland1-0/+23
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-2/+6
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland1-2/+9
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-1/+1
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-3/+103
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-4/+4
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-1/+20
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-5/+10
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland1-23/+5
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+54
2010-11-17builtin/notes.c: Split notes ref DWIMmery into a separate functionLibravatar Johan Herland1-6/+11
2010-11-17notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondLibravatar Johan Herland1-5/+6
2010-11-16clean: avoid quoting twiceLibravatar Nguyễn Thái Ngọc Duy1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 19:30:58 +0000