summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2010-03-21cherry-pick, revert: add a label for ancestorJonathan Nieder
2010-03-21revert: clarify label on conflict hunksJonathan Nieder
2010-03-21compat: add mempcpy()Jonathan Nieder
2010-03-21checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-03-21merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder
2010-03-21checkout --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-03-21merge-file --diff3: add a label for ancestorJonathan Nieder
2010-03-21xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder
2010-03-21xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder
2010-03-21tests: document cherry-pick behavior in face of conflictsJonathan Nieder
2010-03-21tests: document format of conflicts from checkout -mJonathan Nieder
2010-03-20Update draft release notes to 1.7.1Junio C Hamano
2010-03-20Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano
2010-03-20Merge branch 'ml/color-grep'Junio C Hamano
2010-03-20Merge branch 'jc/color-attrs'Junio C Hamano
2010-03-20Merge branch 'cc/reset-keep'Junio C Hamano
2010-03-20Merge branch 'fl/askpass'Junio C Hamano
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano
2010-03-20Merge branch 'bw/union-merge-refactor'Junio C Hamano
2010-03-20Merge branch 'maint'Junio C Hamano
2010-03-20Update draft release notes to 1.7.0.3Junio C Hamano
2010-03-20fetch: Fix minor memory leakAndreas Gruenbacher
2010-03-20fetch: Future-proof initialization of a refspec on stackAndreas Gruenbacher
2010-03-20fetch: Check for a "^{}" suffix with suffixcmp()Andreas Gruenbacher
2010-03-20Fix a spelling mistake in a git-p4 console messageBenjamin C Meyer
2010-03-20Use test_expect_success for test setupsBrian Gernhardt
2010-03-20daemon: parse_host_and_port SIGSEGV if port is specifiedImre Deak
2010-03-20Makefile: Fix occasional GIT-CFLAGS breakageJonathan Nieder
2010-03-20Makefile: Fix CDPATH problemJonathan Nieder
2010-03-20notes.c: remove inappropriate call to returnBrandon Casey
2010-03-20pull: replace unnecessary sed invocationStephen Boyd
2010-03-17Merge branch 'maint'Junio C Hamano
2010-03-17Documentation: receive.denyCurrentBranch defaults to 'refuse'Thomas Rast
2010-03-17bash: complete *_HEAD refs if presentIan Ward Comfort
2010-03-17Merge branch 'maint'Junio C Hamano
2010-03-15Documentation/git-read-tree: clarify 2-tree mergeMichael J Gruber
2010-03-15Documentation/git-read-tree: fix table layoutMichael J Gruber
2010-03-15Merge branch 'sd/format-patch-to'Junio C Hamano
2010-03-15Merge branch 'tc/http-cleanup'Junio C Hamano
2010-03-15Merge branch 'tc/transport-verbosity'Junio C Hamano
2010-03-15Merge branch 'ld/push-porcelain'Junio C Hamano
2010-03-15Merge branch 'jh/notes'Junio C Hamano
2010-03-14tests for "git add ignored-dir/file" without -fJunio C Hamano
2010-03-14dir: fix COLLECT_IGNORED on excluded prefixesJeff King
2010-03-14t0050: mark non-working test as suchJunio C Hamano
2010-03-14Merge branch 'maint'Junio C Hamano
2010-03-14don't use default revision if a rev was specifiedDave Olszewski
2010-03-13for_each_recent_reflog_ent(): use strbuf, fix offset handlingRené Scharfe
generated by cgit v0.10.2-6-g49f6 at 2024-04-27 15:27:01 (GMT)