summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* format-patch: add --inline option and make --attach a true attachmentJohannes Schindelin2007-03-0411-13/+386
* Merge branch 'js/fetch-progress' (early part)Junio C Hamano2007-03-046-14/+47
|\
| * Fixup no-progress for fetch & cloneJohannes Schindelin2007-02-244-18/+9
| * fetch & clone: do not output progress when not on a ttyJohannes Schindelin2007-02-196-13/+55
* | Merge branch 'js/symlink'Junio C Hamano2007-03-0415-13/+175
|\ \
| * | Tell multi-parent diff about core.symlinks.Johannes Sixt2007-03-031-0/+10
| * | Handle core.symlinks=false case in merge-recursive.Johannes Sixt2007-03-032-1/+64
| * | Add core.symlinks to mark filesystems that do not support symbolic links.Johannes Sixt2007-03-0212-12/+101
* | | Merge branch 'maint'Junio C Hamano2007-03-045-48/+167
|\ \ \
| * | | GIT 1.5.0.3v1.5.0.3Junio C Hamano2007-03-042-12/+15
| * | | glossary: Add definitions for dangling and unreachable objectsYasushi SHOJI2007-03-041-0/+9
| * | | user-manual: more detailed merge discussionJ. Bruce Fields2007-03-041-25/+77
| * | | user-manual: how to replace commits older than most recentJ. Bruce Fields2007-03-041-0/+46
| * | | user-manual: insert earlier of mention content-addressable architectureJ. Bruce Fields2007-03-041-9/+15
| * | | user-manual: ensure generated manual references stylesheetJ. Bruce Fields2007-03-041-1/+4
| * | | user-manual: reset to ORIG_HEAD not HEAD to undo mergeJ. Bruce Fields2007-03-041-1/+1
| * | | Documentation: mention module option to git-cvsimportJ. Bruce Fields2007-03-041-1/+1
* | | | git-svn: fix show-ignore when not connected to the repository rootEric Wong2007-03-041-2/+2
* | | | diff-ni: allow running from a subdirectory.Junio C Hamano2007-03-031-1/+13
* | | | Merge branch 'js/diff-ni' (early part)Junio C Hamano2007-03-034-2/+64
|\ \ \ \
| * | | | diff: make more cases implicit --no-indexJohannes Schindelin2007-02-284-2/+64
* | | | | Merge branch 'maint'Junio C Hamano2007-03-039-12/+37
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Unset NO_C99_FORMAT on Cygwin.Ramsay Jones2007-03-031-1/+0
| * | | Fix a "pointer type missmatch" warning.Ramsay Jones2007-03-032-2/+15
| * | | Fix some "comparison is always true/false" warnings.Ramsay Jones2007-03-031-4/+6
| * | | Fix an "implicit function definition" warning.Ramsay Jones2007-03-031-0/+6
| * | | Fix a "label defined but unreferenced" warning.Ramsay Jones2007-03-031-0/+2
| * | | Document the config variable format.suffixJohannes Schindelin2007-03-031-0/+5
| * | | git-merge: fail correctly when we cannot fast forward.Junio C Hamano2007-03-031-1/+1
| * | | builtin-archive: use RUN_SETUPJohannes Schindelin2007-03-032-3/+1
| * | | Fix git-gc usage noteMatthias Kestenholz2007-03-031-1/+1
* | | | Merge branch 'maint'Junio C Hamano2007-03-021-1/+1
|\ \ \ \ | |/ / /
| * | | Fix quoting in update hook templateGerrit Pape2007-03-021-1/+1
* | | | git-branch: document new --no-abbrev optionJulian Phillips2007-03-021-1/+5
* | | | git-branch: improve abbreviation of sha1s in verbose modeJulian Phillips2007-03-021-2/+10
* | | | print_wrapped_text: fix output for negative indentJohannes Schindelin2007-03-021-1/+1
* | | | Sample update hook: typofix and modernization to use "git log"Andy Parkins2007-03-021-5/+4
* | | | Merge branch 'js/commit-format'Junio C Hamano2007-03-028-16/+268
|\ \ \ \
| * | | | show_date(): rename the "relative" parameter to "mode"Johannes Schindelin2007-02-272-9/+14
| * | | | Actually make print_wrapped_text() usefulJohannes Schindelin2007-02-272-6/+13
| * | | | pretty-formats: add 'format:<string>'Johannes Schindelin2007-02-224-1/+241
| | |_|/ | |/| |
* | | | Merge branch 'maint'Junio C Hamano2007-03-026-20/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Another memory overrun in http-push.cEygene Ryabinkin2007-03-021-3/+7
| * | | fetch.o depends on the headers, too.Johannes Schindelin2007-03-011-1/+1
| * | | Documentation: Correct minor typo in git-add documentation.Christian Schlotter2007-03-011-1/+1
| * | | Documentation/git-send-email.txt: Fix labeled list formattingSergey Vlasov2007-03-011-6/+6
| * | | Documentation/git-quiltimport.txt: Fix labeled list formattingSergey Vlasov2007-03-011-4/+4
| * | | Documentation/build-docdep.perl: Fix dependencies for included asciidoc filesSergey Vlasov2007-03-011-5/+1
* | | | Documentation/git-svn.txt: Fix formatting errorsSergey Vlasov2007-03-011-52/+67
* | | | fix various doc typosMichael Coleman2007-03-013-6/+6
| |_|/ |/| |
View Lorry Controller Status