summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
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-08-09notes: allow --dry-run for -n and --verbose for -vLibravatar René Scharfe1-2/+3
2010-08-06Allow "check-ref-format --branch" from subdirectoryLibravatar Jonathan Nieder1-0/+2
2010-08-06check-ref-format: handle subcommands in separate functionsLibravatar Jonathan Nieder1-17/+25
2010-07-27commit: remove full stop from usage help for -uLibravatar Stephen Boyd1-1/+1
2010-07-27Clarify help message when no remote is specified in fetch/pull.Libravatar Matthieu Moy1-1/+2
2010-07-25Cast execl*() NULL sentinels to (char *)Libravatar Thomas Rast1-6/+6
2010-07-19Merge branch 'jl/add-n-ignore-missing'Libravatar Junio C Hamano1-4/+12
2010-07-16Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-13/+0
2010-07-15Merge branch 'wp/merge-tree-fix'Libravatar Junio C Hamano1-1/+2
2010-07-15Merge branch 'js/merge-rr-fix'Libravatar Junio C Hamano1-1/+1
2010-07-15Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-8/+23
2010-07-15Merge branch 'jn/grep-open'Libravatar Junio C Hamano1-0/+1
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Libravatar Junio C Hamano1-5/+11
2010-07-14MERGE_RR is in .git, not .git/rr-cacheLibravatar Jay Soffian1-1/+1
2010-07-14merge-tree: fix where two branches share no changesLibravatar Will Palmer1-1/+2
2010-07-12git add: Add the "--ignore-missing" option for the dry runLibravatar Jens Lehmann1-4/+12
2010-07-08Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixLibravatar Junio C Hamano90-0/+43957
2010-07-07grep -O: Do not pass color sequences as filenames to pagerLibravatar Nazri Ramliy1-0/+1
2010-07-07Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2010-07-07Merge branch 'maint-1.6.4' into maintLibravatar Junio C Hamano1-2/+2
2010-07-07Merge branch 'tr/receive-pack-aliased-update-fix' into maintLibravatar Junio C Hamano1-37/+91
2010-07-06do not write out index when status does not have toLibravatar Junio C Hamano1-5/+11
2010-06-30Merge branch 'ar/decorate-color'Libravatar Junio C Hamano1-0/+3
2010-06-30Merge branch 'cc/cherry-pick-stdin'Libravatar Junio C Hamano1-17/+18
2010-06-30Merge branch 'jl/status-ignore-submodules'Libravatar Junio C Hamano1-1/+6
2010-06-30Merge branch 'jn/grep-open'Libravatar Junio C Hamano1-26/+95
2010-06-30Merge branch 'jp/string-list-api-cleanup'Libravatar Junio C Hamano14-79/+79
2010-06-30Merge branch 'tr/rev-list-count'Libravatar Junio C Hamano1-0/+16
2010-06-29revert: do not rebuild argv on heapLibravatar Jonathan Nieder1-16/+16
2010-06-28Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
2010-06-28notes: check number of parameters to "git notes copy"Libravatar Jeff King1-0/+4
2010-06-27Merge branch 'cp/textconv-cat-file'Libravatar Junio C Hamano2-8/+38
2010-06-27Merge branch 'ab/blame-textconv'Libravatar Junio C Hamano1-13/+72
2010-06-27Merge branch 'jp/string-list-api-cleanup' into jn/grep-openLibravatar Julian Phillips15-82/+82
2010-06-27string_list: Fix argument order for string_list_appendLibravatar Julian Phillips9-52/+52
2010-06-27string_list: Fix argument order for string_list_lookupLibravatar Julian Phillips3-4/+4
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 02:18:20 +0000