summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| |\ \
| | * | user-manual: introduce "branch" and "branch head" differentlyJ. Bruce Fields2007-03-181-22/+21
| | * | glossary: clean up cross-referencesJ. Bruce Fields2007-03-181-29/+29
| | * | glossary: stop generating automaticallyJ. Bruce Fields2007-03-184-428/+392
| | * | user-manual: Use def_ instead of ref_ for glossary references.J. Bruce Fields2007-03-181-2/+2
| | * | user-manual.txt: fix a tiny typo.Jim Meyering2007-03-181-1/+1
| | * | user-manual: run xsltproc without --nonet optionJ. Bruce Fields2007-03-181-1/+1
* | | | Merge branch 'js/remote-show-push'Junio C Hamano2007-03-251-1/+15
|\ \ \ \
| * | | | Teach git-remote to list pushed branches.Johannes Sixt2007-03-201-1/+15
* | | | | Merge branch 'maint'Junio C Hamano2007-03-252-1/+185
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | gitweb: Add some installation notes in gitweb/INSTALLJakub Narebski2007-03-241-0/+184
| * | | | gitweb: Fix not marking signoff lines in "log" viewJakub Narebski2007-03-241-1/+1
| * | | | gitweb: Don't escape attributes in CGI.pm HTML methodsJakub Narebski2007-03-241-3/+3
| * | | | gitweb: Change to use explicitly function call cgi->escapHTML()Li Yang2007-03-241-2/+2
* | | | | Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen2007-03-243-18/+12
* | | | | Document --quiet option to git-diffAlex Riesen2007-03-241-0/+3
* | | | | write_sha1_from_fd() should make new objects read-onlyNicolas Pitre2007-03-241-0/+1
* | | | | make it more obvious that temporary files are temporary filesNicolas Pitre2007-03-243-6/+6
* | | | | update-hook: remove e-mail sending hook.Andy Parkins2007-03-241-222/+3
* | | | | git-am documentation: describe what is taken from where.Junio C Hamano2007-03-241-0/+27
* | | | | git-revert: Revert revert message to old behaviourJohannes Schindelin2007-03-241-5/+5
* | | | | Merge branch 'maint'Junio C Hamano2007-03-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | gitweb: Fix "next" link in commit viewJakub Narebski2007-03-231-1/+1
* | | | | Documentation: bisect: make a comment fit better in the man page.Christian Couder2007-03-231-3/+3
* | | | | Documentation: bisect: add some titles to some paragraphs.Christian Couder2007-03-231-0/+21
* | | | | Documentation: bisect: reformat more paragraphs.Christian Couder2007-03-231-34/+39
* | | | | Documentation: bisect: reword one paragraph.Christian Couder2007-03-231-3/+3
* | | | | Documentation: bisect: reformat some paragraphs.Christian Couder2007-03-231-6/+6
* | | | | Fix path-limited "rev-list --bisect" termination condition.Junio C Hamano2007-03-231-1/+1
* | | | | git-bisect.sh: properly dq $GIT_DIRJunio C Hamano2007-03-231-1/+1
* | | | | git-bisect: typofixJunio C Hamano2007-03-231-1/+1
View Lorry Controller Status