summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-04-18Allow the default low-level merge driver to be configured.Libravatar Junio C Hamano1-2/+12
2007-04-18Custom low-level merge driver support.Libravatar Junio C Hamano2-13/+235
2007-04-17Add a demonstration/test of customized merge.Libravatar Junio C Hamano1-0/+72
2007-04-17Allow specifying specialized merge-backend per path.Libravatar Junio C Hamano1-7/+129
2007-04-17merge-recursive: separate out xdl_merge() interface.Libravatar Junio C Hamano1-21/+35
2007-04-17Allow more than true/false to attributes.Libravatar Junio C Hamano5-82/+169
2007-04-15Document git-check-attrLibravatar James Bowes2-0/+38
2007-04-15Change attribute negation marker from '!' to '-'.Libravatar Junio C Hamano3-7/+52
2007-04-15Define a built-in attribute macro "binary".Libravatar Junio C Hamano1-0/+1
2007-04-15attribute macro supportLibravatar Junio C Hamano2-48/+132
2007-04-15Makefile: add patch-ids.h back in.Libravatar Junio C Hamano1-1/+1
2007-04-15Fix 'diff' attribute semantics.Libravatar Junio C Hamano1-2/+3
2007-04-15Fix 'crlf' attribute semantics.Libravatar Junio C Hamano1-44/+78
2007-04-14Teach 'diff' about 'diff' attribute.Libravatar Junio C Hamano2-27/+31
2007-04-14Define 'crlf' attribute.Libravatar Junio C Hamano3-7/+84
2007-04-14Add basic infrastructure to assign attributes to pathsLibravatar Junio C Hamano8-2/+453
2007-04-14Merge branch 'maint'Libravatar Junio C Hamano4-17/+49
2007-04-14git-quiltimport complaining yet still workingLibravatar Linus Torvalds1-2/+2
2007-04-13config.txt: Fix grammatical error in description of http.noEPSVLibravatar Frank Lichtenheld1-1/+1
2007-04-13config.txt: Change pserver to server in description of gitcvs.*Libravatar Frank Lichtenheld1-2/+2
2007-04-13config.txt: Document core.autocrlfLibravatar Frank Lichtenheld1-0/+10
2007-04-13config.txt: Document gitcvs.allbinaryLibravatar Frank Lichtenheld1-0/+7
2007-04-13Do not default to --no-index when given two directories.Libravatar Junio C Hamano1-10/+26
2007-04-13Use rev-list --reverse in git-rebase.shLibravatar Alex Riesen1-2/+1
2007-04-12Merge branch 'jc/cherry'Libravatar Junio C Hamano9-35/+346
2007-04-12Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2007-04-12handle_options in git wrapper miscounts the options it handled.Libravatar Matthias Lederhofer1-0/+1
2007-04-12Fix git {log,show,...} --pretty=emailLibravatar Junio C Hamano2-1/+1
2007-04-12Don't yap about merge-subtree during makeLibravatar Shawn O. Pearce1-1/+1
2007-04-11Documentation: --cherry-pickLibravatar Junio C Hamano1-0/+15
2007-04-11git-log --cherry-pick A...BLibravatar Junio C Hamano2-0/+89
2007-04-11Refactor patch-id filtering out of git-cherry and git-format-patch.Libravatar Junio C Hamano4-32/+228
2007-04-11Add %m to '--pretty=format:'Libravatar Junio C Hamano2-3/+14
2007-04-11sscanf/strtoul: parse integers robustlyLibravatar Jim Meyering4-18/+22
2007-04-11Add testcase for format-patch --subject-prefix (take 3)Libravatar Robin H. Johnson2-0/+165
2007-04-11Add custom subject prefix support to format-patch (take 3)Libravatar Robin H. Johnson4-11/+31
2007-04-11Merge branch 'maint'Libravatar Junio C Hamano6-20/+44
2007-04-11GIT 1.5.1.1Libravatar Junio C Hamano2-8/+23
2007-04-11cvsserver: Fix handling of diappeared files on updateLibravatar Frank Lichtenheld1-0/+1
2007-04-11fsck: do not complain on detached HEAD.Libravatar Junio C Hamano1-8/+16
2007-04-11(encode_85, decode_85): Mark source buffer pointer as "const".Libravatar Jim Meyering2-4/+4
2007-04-10gitweb: Allow configuring the default projects order and add order 'none'Libravatar Frank Lichtenheld1-4/+7
2007-04-10gitweb: Allow forks with project list fileLibravatar Frank Lichtenheld1-7/+27
2007-04-10Merge branch 'maint'Libravatar Junio C Hamano2-3/+24
2007-04-09Documentation: show-ref: document --exclude-existingLibravatar Julian Phillips1-0/+16
2007-04-09cvsexportcommit -p : fix the usage of git-apply -C.Libravatar Tomash Brechko1-3/+8
2007-04-09git-archive: make tar the default formatLibravatar René Scharfe3-5/+12
2007-04-08Merge branch 'jc/push'Libravatar Junio C Hamano1-7/+10
2007-04-08Merge branch 'jc/merge-subtree'Libravatar Junio C Hamano7-3/+373
2007-04-08Merge branch 'js/fetch-progress'Libravatar Junio C Hamano1-4/+10
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 13:52:22 +0000