summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-131-1/+1
| * config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld2007-04-131-2/+2
| * config.txt: Document core.autocrlfFrank Lichtenheld2007-04-131-0/+10
| * config.txt: Document gitcvs.allbinaryFrank Lichtenheld2007-04-131-0/+7
| * Do not default to --no-index when given two directories.Junio C Hamano2007-04-131-10/+26
| * Use rev-list --reverse in git-rebase.shAlex Riesen2007-04-131-2/+1
* | Merge branch 'jc/cherry'Junio C Hamano2007-04-129-35/+346
|\ \
| * | Documentation: --cherry-pickJunio C Hamano2007-04-111-0/+15
| * | git-log --cherry-pick A...BJunio C Hamano2007-04-112-0/+89
| * | Refactor patch-id filtering out of git-cherry and git-format-patch.Junio C Hamano2007-04-114-32/+228
| * | Add %m to '--pretty=format:'Junio C Hamano2007-04-112-3/+14
* | | Merge branch 'maint'Junio C Hamano2007-04-121-0/+1
|\ \ \ | | |/ | |/|
| * | handle_options in git wrapper miscounts the options it handled.Matthias Lederhofer2007-04-121-0/+1
* | | Fix git {log,show,...} --pretty=emailJunio C Hamano2007-04-122-1/+1
* | | Don't yap about merge-subtree during makeShawn O. Pearce2007-04-121-1/+1
| |/ |/|
* | sscanf/strtoul: parse integers robustlyJim Meyering2007-04-114-18/+22
* | Add testcase for format-patch --subject-prefix (take 3)Robin H. Johnson2007-04-112-0/+165
* | Add custom subject prefix support to format-patch (take 3)Robin H. Johnson2007-04-114-11/+31
* | Merge branch 'maint'Junio C Hamano2007-04-116-20/+44
|\ \ | |/
| * GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-112-8/+23
| * cvsserver: Fix handling of diappeared files on updateFrank Lichtenheld2007-04-111-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-101-4/+7
* | gitweb: Allow forks with project list fileFrank Lichtenheld2007-04-101-7/+27
* | Merge branch 'maint'Junio C Hamano2007-04-102-3/+24
|\ \ | |/
| * Documentation: show-ref: document --exclude-existingJulian Phillips2007-04-091-0/+16
| * cvsexportcommit -p : fix the usage of git-apply -C.Tomash Brechko2007-04-091-3/+8
* | git-archive: make tar the default formatRené Scharfe2007-04-093-5/+12
* | Merge branch 'jc/push'Junio C Hamano2007-04-081-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-087-3/+373
|\ \ \
| * | | A new merge stragety 'subtree'.Junio C Hamano2007-04-077-3/+373
| |/ /
* | | Merge branch 'js/fetch-progress'Junio C Hamano2007-04-081-4/+10
|\ \ \
| * | | git-fetch: add --quietJunio C Hamano2007-03-091-4/+10
* | | | Merge branch 'maint'Junio C Hamano2007-04-082-22/+31
|\ \ \ \ | | |_|/ | |/| |
| * | | Add Documentation/cmd-list.made to .gitignoreJunio C Hamano2007-04-081-0/+1
| * | | git-svn: fix log command to avoid infinite loop on long commit messagesEric Wong2007-04-081-2/+9
| * | | git-svn: dcommit/rebase confused by patches with git-svn-id: linesEric Wong2007-04-081-20/+21
| * | | git-svn: bail out on incorrect command-line optionsEric Wong2007-04-081-1/+4
* | | | Start 1.5.2 cycle by prepareing RelNotes for it.Junio C Hamano2007-04-072-1/+77
* | | | Merge branch 'jc/read-tree-df' (early part)Junio C Hamano2007-04-074-28/+167
|\ \ \ \
| * | | | Fix switching to a branch with D/F when current branch has file D.Junio C Hamano2007-04-041-1/+112
| * | | | Fix twoway_merge that passed d/f conflict marker to merged_entry().Junio C Hamano2007-04-041-2/+8
| * | | | Fix read-tree --prefix=dir/.Junio C Hamano2007-04-041-0/+1
| * | | | unpack-trees: get rid of *indpos parameter.Junio C Hamano2007-04-042-9/+8
View Lorry Controller Status