summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2010-12-13Merge branch 'jn/parse-options-extra'Junio C Hamano
2010-12-13Merge branch 'tc/format-patch-p'Junio C Hamano
2010-12-13Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano
2010-12-10thread-utils.h: simplify the inclusionJunio C Hamano
2010-12-08Merge branch 'nd/maint-fix-add-typo-detection' (early part)Junio C Hamano
2010-12-08Merge branch 'il/remote-fd-ext'Junio C Hamano
2010-12-08Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano
2010-12-08Merge branch 'jh/notes-merge'Junio C Hamano
2010-12-07update-index: migrate to parse-options APIJonathan Nieder
2010-12-07parse-options: Don't call parse_options_check() so muchStephen Boyd
2010-12-04Merge branch 'jn/thinner-wrapper'Junio C Hamano
2010-12-04Merge branch 'pn/commit-autosquash'Junio C Hamano
2010-12-04Merge branch 'sn/diff-doc'Junio C Hamano
2010-12-02Merge branch 'maint'Junio C Hamano
2010-12-02Merge branch 'maint-1.7.2' into maintJunio C Hamano
2010-12-02Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano
2010-12-02Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano
2010-11-30Merge branch 'jl/clone-recurse-sm-synonym'Junio C Hamano
2010-11-30Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano
2010-11-30Merge branch 'np/pack-broken-boundary'Junio C Hamano
2010-11-30Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano
2010-11-30Merge branch 'kb/blame-author-email'Junio C Hamano
2010-11-30Merge branch 'ak/apply-non-git-epoch'Junio C Hamano
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano
2010-11-24Merge branch 'rs/opt-help-text'Junio C Hamano
2010-11-24Merge branch 'mm/phrase-remote-tracking'Junio C Hamano
2010-11-24Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano
2010-11-24Merge branch 'jn/send-pack-error' into maintJunio C Hamano
2010-11-24Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano
2010-11-24Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano
2010-11-23format-patch: page output with --stdoutTay Ray Chuan
2010-11-19remote-fd/ext: finishing touches after code reviewIlari Liusvaara
2010-11-17Merge branch 'jk/maint-apply-no-binary'Junio C Hamano
2010-11-17Merge branch 'jk/push-progress'Junio C Hamano
2010-11-17Merge branch 'tr/maint-merge-file-subdir'Junio C Hamano
2010-11-17Merge branch 'jn/send-pack-error'Junio C Hamano
2010-11-17Merge branch 'jk/maint-rev-list-nul'Junio C Hamano
2010-11-17Merge branch 'ks/no-textconv-symlink'Junio C Hamano
2010-11-17Merge branch 'maint'Junio C Hamano
2010-11-17clean: remove redundant variable baselenNguyễn Thái Ngọc Duy
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland
2010-11-17cmd_merge(): Parse options before checking MERGE_HEADJohan Herland
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedJohan Herland
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland