summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
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
2010-11-17builtin/notes.c: Refactor creation of notes commits.Johan Herland
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland
2010-11-17builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland
2010-11-17notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland
2010-11-16clean: avoid quoting twiceNguyễn Thái Ngọc Duy
2010-11-15verify-tag: document --verboseRené Scharfe
2010-11-15branch: improve --verbose descriptionRené Scharfe
2010-11-15Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder
2010-11-15add OPT__FORCERené Scharfe
2010-11-15add description parameter to OPT__QUIETRené Scharfe
2010-11-15add description parameter to OPT__DRY_RUNRené Scharfe
2010-11-15add description parameter to OPT__VERBOSERené Scharfe
2010-11-15do not overwrite untracked during merge from unborn branchClemens Buchacher
2010-11-13add: do not rely on dtype being NULL behaviorNguyễn Thái Ngọc Duy
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann
2010-11-12fetch/pull: Add the --recurse-submodules optionJens Lehmann
2010-11-10pack-objects: mark file-local variable staticJonathan Nieder
2010-11-10tag: factor out sig detection for tag displayMichael J Gruber
2010-11-10tag: factor out sig detection for body editsMichael J Gruber
2010-11-10verify-tag: factor out signature detectionMichael J Gruber
2010-11-10cherry-pick/revert: transparently refresh indexJonathan Nieder
2010-11-10apply: handle patches with funny filename and colon in timezoneJonathan Nieder
2010-11-05Fix git-apply with -p greater than 1Federico Cuello
2010-11-05clone: Add the --recurse-submodules option as alias for --recursiveJens Lehmann
2010-11-05diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec
2010-11-04commit: --squash option for use with rebase --autosquashPat Notz
2010-11-04commit: --fixup option for use with rebase --autosquashPat Notz