summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
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
2010-11-15verify-tag: document --verboseLibravatar René Scharfe1-1/+1
2010-11-15branch: improve --verbose descriptionLibravatar René Scharfe1-1/+2
2010-11-15Describe various forms of "be quiet" using OPT__QUIETLibravatar Jonathan Nieder10-11/+14
2010-11-15add OPT__FORCELibravatar René Scharfe11-15/+12
2010-11-15add description parameter to OPT__QUIETLibravatar René Scharfe11-12/+12
2010-11-15add description parameter to OPT__DRY_RUNLibravatar René Scharfe7-9/+7
2010-11-15add description parameter to OPT__VERBOSELibravatar René Scharfe12-13/+13
2010-11-15do not overwrite untracked during merge from unborn branchLibravatar Clemens Buchacher1-1/+19
2010-11-12add: do not rely on dtype being NULL behaviorLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2010-11-12Add the 'fetch.recurseSubmodules' config settingLibravatar Jens Lehmann1-5/+16
2010-11-12fetch/pull: Add the --recurse-submodules optionLibravatar Jens Lehmann1-14/+39
2010-11-10pack-objects: mark file-local variable staticLibravatar Jonathan Nieder1-1/+1
2010-11-10tag: factor out sig detection for tag displayLibravatar Michael J Gruber1-2/+2
2010-11-10tag: factor out sig detection for body editsLibravatar Michael J Gruber1-10/+2
2010-11-10verify-tag: factor out signature detectionLibravatar Michael J Gruber1-8/+2
2010-11-10cherry-pick/revert: transparently refresh indexLibravatar Jonathan Nieder1-2/+16
2010-11-10apply: handle patches with funny filename and colon in timezoneLibravatar Jonathan Nieder1-2/+22
2010-11-05Fix git-apply with -p greater than 1Libravatar Federico Cuello1-14/+14
2010-11-05clone: Add the --recurse-submodules option as alias for --recursiveLibravatar Jens Lehmann1-0/+2
2010-11-05diff,difftool: Don't use the {0,2} notation in usage stringsLibravatar Štěpán Němec1-1/+1
2010-11-04commit: --squash option for use with rebase --autosquashLibravatar Pat Notz1-2/+33
2010-11-04commit: --fixup option for use with rebase --autosquashLibravatar Pat Notz1-4/+18
2010-11-04commit: helper methods to reduce redundant blocks of codeLibravatar Pat Notz3-25/+6
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeLibravatar Matthieu Moy4-8/+8
2010-11-03Change "tracking branch" to "remote-tracking branch"Libravatar Matthieu Moy2-3/+3
2010-11-03Replace "remote tracking" with "remote-tracking"Libravatar Matthieu Moy1-1/+1
2010-10-29apply: don't segfault on binary files with missing dataLibravatar Jeff King1-0/+6
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano3-32/+5
2010-10-22make pack-objects a bit more resilient to repo corruptionLibravatar Nicolas Pitre1-1/+15
2010-10-22update-index -h: show usage even with corrupt indexLibravatar Nguyễn Thái Ngọc Duy1-0/+3
2010-10-22merge -h: show usage even with corrupt indexLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2010-10-22ls-files -h: show usage even with corrupt indexLibravatar Nguyễn Thái Ngọc Duy1-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 08:26:09 +0000