summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Custom low-level merge driver support.Junio C Hamano2007-04-182-13/+235
* Add a demonstration/test of customized merge.Junio C Hamano2007-04-171-0/+72
* Allow specifying specialized merge-backend per path.Junio C Hamano2007-04-171-7/+129
* merge-recursive: separate out xdl_merge() interface.Junio C Hamano2007-04-171-21/+35
* Allow more than true/false to attributes.Junio C Hamano2007-04-175-82/+169
* Document git-check-attrJames Bowes2007-04-162-0/+38
* Change attribute negation marker from '!' to '-'.Junio C Hamano2007-04-163-7/+52
* Define a built-in attribute macro "binary".Junio C Hamano2007-04-161-0/+1
* attribute macro supportJunio C Hamano2007-04-162-48/+132
* Makefile: add patch-ids.h back in.Junio C Hamano2007-04-151-1/+1
* Fix 'diff' attribute semantics.Junio C Hamano2007-04-151-2/+3
* Fix 'crlf' attribute semantics.Junio C Hamano2007-04-151-44/+78
* Teach 'diff' about 'diff' attribute.Junio C Hamano2007-04-142-27/+31
* Define 'crlf' attribute.Junio C Hamano2007-04-143-7/+84
* Add basic infrastructure to assign attributes to pathsJunio C Hamano2007-04-148-2/+453
* Merge branch 'maint'Junio C Hamano2007-04-144-17/+49
|\
| * git-quiltimport complaining yet still workingLinus Torvalds2007-04-141-2/+2
| * config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld2007-04-141-1/+1
| * config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld2007-04-141-2/+2
| * config.txt: Document core.autocrlfFrank Lichtenheld2007-04-141-0/+10
| * config.txt: Document gitcvs.allbinaryFrank Lichtenheld2007-04-141-0/+7
| * Do not default to --no-index when given two directories.Junio C Hamano2007-04-141-10/+26
| * Use rev-list --reverse in git-rebase.shAlex Riesen2007-04-141-2/+1
* | Merge branch 'jc/cherry'Junio C Hamano2007-04-139-35/+346
|\ \
| * | Documentation: --cherry-pickJunio C Hamano2007-04-121-0/+15
| * | git-log --cherry-pick A...BJunio C Hamano2007-04-122-0/+89
| * | Refactor patch-id filtering out of git-cherry and git-format-patch.Junio C Hamano2007-04-124-32/+228
| * | Add %m to '--pretty=format:'Junio C Hamano2007-04-122-3/+14
* | | Merge branch 'maint'Junio C Hamano2007-04-131-0/+1
|\ \ \ | | |/ | |/|
| * | handle_options in git wrapper miscounts the options it handled.Matthias Lederhofer2007-04-131-0/+1
* | | Fix git {log,show,...} --pretty=emailJunio C Hamano2007-04-132-1/+1
* | | Don't yap about merge-subtree during makeShawn O. Pearce2007-04-131-1/+1
| |/ |/|
* | sscanf/strtoul: parse integers robustlyJim Meyering2007-04-124-18/+22
* | Add testcase for format-patch --subject-prefix (take 3)Robin H. Johnson2007-04-122-0/+165
* | Add custom subject prefix support to format-patch (take 3)Robin H. Johnson2007-04-124-11/+31
* | Merge branch 'maint'Junio C Hamano2007-04-126-20/+44
|\|
| * GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-122-8/+23
| * cvsserver: Fix handling of diappeared files on updateFrank Lichtenheld2007-04-121-0/+1
| * fsck: do not complain on detached HEAD.Junio C Hamano2007-04-111-8/+16
| * (encode_85, decode_85): Mark source buffer pointer as "const".Jim Meyering2007-04-112-4/+4
* | gitweb: Allow configuring the default projects order and add order 'none'Frank Lichtenheld2007-04-111-4/+7
* | gitweb: Allow forks with project list fileFrank Lichtenheld2007-04-111-7/+27
* | Merge branch 'maint'Junio C Hamano2007-04-102-3/+24
|\|
| * Documentation: show-ref: document --exclude-existingJulian Phillips2007-04-101-0/+16
| * cvsexportcommit -p : fix the usage of git-apply -C.Tomash Brechko2007-04-101-3/+8
* | git-archive: make tar the default formatRené Scharfe2007-04-103-5/+12
* | Merge branch 'jc/push'Junio C Hamano2007-04-091-7/+10
|\ \
| * | git-push to multiple locations does not stop at the first failureJunio C Hamano2007-04-071-7/+8
| * | git-push reports the URL after failing.Junio C Hamano2007-04-071-0/+2
* | | Merge branch 'jc/merge-subtree'Junio C Hamano2007-04-097-3/+373
|\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 04:24:25 +0100