summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix AsciiDoc errors in merge documentationJohan Herland2008-09-041-4/+4
* git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-311-0/+65
* checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-313-48/+72
* checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-303-5/+173
* Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-303-24/+177
|\
| * checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-303-3/+72
| * checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-303-24/+59
| * checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-302-1/+50
* | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-302-6/+14
* | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-305-1/+47
* | rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-301-2/+8
* | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-301-10/+13
* | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-302-3/+10
* | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-301-7/+7
* | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-304-21/+135
* | xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-301-51/+70
|/
* tutorial: gentler illustration of Alice/Bob workflow using gitkPaolo Ciarrocchi2008-08-291-1/+28
* pretty=format: respect date format optionsJeff King2008-08-296-10/+22
* make git-shell paranoid about closed stdin/stdout/stderrPaolo Bonzini2008-08-291-0/+13
* Document gitk --argscmd flag.Yann Dirson2008-08-291-0/+7
* Fix '--dirstat' with cross-directory renamingLinus Torvalds2008-08-291-0/+8
* for-each-ref: Allow a trailing slash in the patternsBjörn Steinbrink2008-08-291-1/+2
* ctype.c: protect tiny C preprocessor constantsJunio C Hamano2008-08-271-0/+5
* index-pack: be careful after fixing up the header/footerLinus Torvalds2008-08-272-1/+1
* index-pack: setup git repositoryNguyễn Thái Ngọc Duy2008-08-261-0/+2
* Suppress some bash redirection error messagesRamsay Jones2008-08-263-10/+4
* Fix a warning (on cygwin) to allow -WerrorRamsay Jones2008-08-261-1/+2
* Fix "git log -i --grep"Jeff King2008-08-244-24/+38
* GIT 1.6.0.1v1.6.0.1Junio C Hamano2008-08-241-6/+11
* Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano2008-08-242-0/+28
|\
| * Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-232-0/+28
* | Merge branch 'mv/maint-merge-fix' into maintJunio C Hamano2008-08-244-8/+32
|\ \
| * | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-234-8/+32
| |/
* | Documentation: clarify pager configurationJonathan Nieder2008-08-242-3/+9
* | Documentation: clarify pager.<cmd> configurationJonathan Nieder2008-08-241-3/+5
* | Clean up the git-p4 documentationSimon Hausmann2008-08-241-31/+38
* | Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UXMiklos Vajna2008-08-231-0/+1
|/
* unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano2008-08-233-2/+6
* git-p4: Fix one-liner in p4_write_pipe function.Tor Arvid Lund2008-08-221-1/+1
* Completion: add missing '=' for 'diff --diff-filter'Eric Raible2008-08-221-1/+1
* Fix 'git help help'Miklos Vajna2008-08-211-1/+2
* compat/snprintf.c: handle snprintf's that always return the # chars transmittedBrandon Casey2008-08-211-0/+4
* git-svn: fix dcommit to urls with embedded usernamesEric Wong2008-08-201-3/+5
* revision.h: make show_early_output an extern which is defined in revision.cBrandon Casey2008-08-201-1/+1
* Update draft release notes for 1.6.0.1Junio C Hamano2008-08-201-2/+18
* Add hints to revert documentation about other ways to undo changesTarmigan Casebolt2008-08-201-0/+9
* Install templates with the user and group of the installing personalityJohannes Sixt2008-08-201-1/+1
* "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano2008-08-202-1/+11
* completion: find out supported merge strategies correctlyJunio C Hamano2008-08-201-6/+8
* decorate: allow const objects to be decoratedJeff King2008-08-202-8/+9
View Lorry Controller Status