summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2008-08-31checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano
2008-08-31Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano
2008-08-31git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano
2008-08-31merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano
2008-08-31rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano
2008-08-31rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano
2008-08-31xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano
2008-08-31xmerge.c: minimum readability fixupsJunio C Hamano
2008-08-31xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano
2008-08-31xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano
2008-08-31checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano
2008-08-31checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano
2008-08-30checkout: do not check out unmerged higher stages randomlyJunio C Hamano
2008-08-29tutorial: gentler illustration of Alice/Bob workflow using gitkPaolo Ciarrocchi
2008-08-29pretty=format: respect date format optionsJeff King
2008-08-29make git-shell paranoid about closed stdin/stdout/stderrPaolo Bonzini
2008-08-29Document gitk --argscmd flag.Yann Dirson
2008-08-29Fix '--dirstat' with cross-directory renamingLinus Torvalds
2008-08-29for-each-ref: Allow a trailing slash in the patternsBjörn Steinbrink
2008-08-27ctype.c: protect tiny C preprocessor constantsJunio C Hamano
2008-08-27index-pack: be careful after fixing up the header/footerLinus Torvalds
2008-08-26index-pack: setup git repositoryNguyễn Thái Ngọc Duy
2008-08-26Suppress some bash redirection error messagesRamsay Jones
2008-08-26Fix a warning (on cygwin) to allow -WerrorRamsay Jones
2008-08-25Fix "git log -i --grep"Jeff King
2008-08-24GIT 1.6.0.1v1.6.0.1Junio C Hamano
2008-08-24Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano
2008-08-24Merge branch 'mv/maint-merge-fix' into maintJunio C Hamano
2008-08-24Documentation: clarify pager configurationJonathan Nieder
2008-08-24Documentation: clarify pager.<cmd> configurationJonathan Nieder
2008-08-24Clean up the git-p4 documentationSimon Hausmann
2008-08-24Respect core.autocrlf in combined diffAlexander Gavrilov
2008-08-24Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UXMiklos Vajna
2008-08-24merge: fix numerus bugs around "trivial merge" areaJunio C Hamano
2008-08-24unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano
2008-08-23git-p4: Fix one-liner in p4_write_pipe function.Tor Arvid Lund
2008-08-22Completion: add missing '=' for 'diff --diff-filter'Eric Raible
2008-08-22Fix 'git help help'Miklos Vajna
2008-08-21compat/snprintf.c: handle snprintf's that always return the # chars transmittedBrandon Casey
2008-08-21git-svn: fix dcommit to urls with embedded usernamesEric Wong
2008-08-21revision.h: make show_early_output an extern which is defined in revision.cBrandon Casey
2008-08-20Update draft release notes for 1.6.0.1Junio C Hamano
2008-08-20Add hints to revert documentation about other ways to undo changesTarmigan Casebolt
2008-08-20Install templates with the user and group of the installing personalityJohannes Sixt
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano
2008-08-20completion: find out supported merge strategies correctlyJunio C Hamano
2008-08-20decorate: allow const objects to be decoratedJeff King
2008-08-20for-each-ref: cope with tags with incomplete linesJunio C Hamano
2008-08-20diff --check: do not get confused by new blank lines in the middleJunio C Hamano
2008-08-20remote.c: remove useless if-before-free testJim Meyering
generated by cgit v0.10.2-6-g49f6 at 2024-04-28 10:28:04 (GMT)