summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-quiltimport /bin/sh-ism fixFrancis Daly2007-03-291-1/+1
* Bisect: Improve error message in "bisect_next_check".Christian Couder2007-03-291-7/+9
* Merge branch 'master' of git://repo.or.cz/git/mergetool.gitJunio C Hamano2007-03-292-81/+87
|\
| * mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o2007-03-291-12/+15
| * mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o2007-03-291-1/+1
| * mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o2007-03-291-2/+14
| * mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o2007-03-291-4/+4
| * mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o2007-03-291-1/+1
| * mergetool: factor out common codeTheodore Ts'o2007-03-291-42/+36
| * mergetool: portability fix: don't use reserved word functionTheodore Ts'o2007-03-291-5/+5
| * mergetool: portability fix: don't assume true is in /binTheodore Ts'o2007-03-291-2/+2
| * mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o2007-03-291-6/+5
| * mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o2007-03-291-14/+12
| * Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-291-5/+5
* | GIT 1.5.1-rc3v1.5.1-rc3Junio C Hamano2007-03-281-1/+1
* | Update main git.html page to point at 1.5.0.6 documentationJunio C Hamano2007-03-281-1/+3
* | Merge branch 'maint' to synchronize with 1.5.0.6Junio C Hamano2007-03-283-3/+28
|\ \
| * | GIT 1.5.0.6v1.5.0.6Junio C Hamano2007-03-283-2/+24
| * | commit: fix pretty-printing of messages with "\nencoding "Jeff King2007-03-281-2/+5
| * | t4118: be nice to non-GNU sedJohannes Schindelin2007-03-281-1/+2
| * | git-commit: "read-tree -m HEAD" is not the right way to read-tree quicklyJunio C Hamano2007-03-281-1/+1
* | | t/t6006: add tests for a slightly more complex commit messagesJeff King2007-03-281-0/+42
* | | Fix "--pretty=format:" encoding itemJeff King2007-03-281-1/+2
* | | Fix "--pretty=format:" for parent related items.Junio C Hamano2007-03-282-8/+12
* | | http-fetch: remove path_len from struct alt_base, it was computed but never usedGerrit Pape2007-03-281-17/+3
* | | http-fetch: don't use double-slash as directory separator in URLsGerrit Pape2007-03-283-11/+14
* | | Add some basic tests of rev-list --pretty=formatJeff King2007-03-271-0/+108
* | | git-upload-pack: make sure we close unused pipe endsH. Peter Anvin2007-03-271-0/+1
* | | --pretty=format: fix broken %ct and %at interpolationJeff King2007-03-271-1/+1
* | | use xrealloc in help.cJames Bowes2007-03-271-11/+1
* | | read-tree: use xcallocJames Bowes2007-03-271-1/+1
* | | Fix "getaddrinfo()" bugletLinus Torvalds2007-03-271-1/+3
* | | Makefile: remove test-chmtime program in target clean.Gerrit Pape2007-03-271-1/+1
* | | gitweb: Cleanup and uniquify die_error callsJakub Narebski2007-03-271-3/+3
* | | sha1_file.c (write_sha1_file): Detect close failureJunio C Hamano2007-03-271-1/+2
* | | git.el: Display some information about the HEAD commit.Alexandre Julliard2007-03-271-2/+20
* | | Document git-log --first-parentJunio C Hamano2007-03-271-0/+5
* | | Bisect: add checks at the beginning of "git bisect run".Christian Couder2007-03-271-0/+8
* | | sha1_file.c (write_sha1_from_fd): Detect close failure.Jim Meyering2007-03-271-1/+2
* | | git-rm: don't remove newly added file without -fJeff King2007-03-271-14/+4
| |/ |/|
* | Bisect: Use "git-show-ref --verify" when reseting.Christian Couder2007-03-251-1/+1
* | gitweb: Add example of config file and how to generate projects list to gitwe...Jakub Narebski2007-03-251-2/+43
* | GIT 1.5.1-rc2v1.5.1-rc2Junio C Hamano2007-03-252-14/+41
* | git-svn: fix rel_path() when not connected to the repository rootEric Wong2007-03-251-2/+4
* | use xmalloc in git.c and help.cJames Bowes2007-03-252-2/+2
* | Merge branch 'jc/fpl'Junio C Hamano2007-03-252-5/+12
|\ \
| * | git-log --first-parent: show only the first parent logJunio C Hamano2007-03-142-5/+12
* | | Update README to point at a few key periodical messages to the listJunio C Hamano2007-03-251-0/+6
* | | Merge branch 'maint'Junio C Hamano2007-03-254-453/+416
|\ \ \ | | |/ | |/|
| * | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano2007-03-254-453/+416
| |\ \
View Lorry Controller Status