summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* -Wold-style-definition fixJunio C Hamano2007-06-133-3/+3
* Makefile: allow generating git.o for debugging purposesJunio C Hamano2007-06-131-2/+6
* Makefile: common-cmds.h depends on generate-cmdlist.sh scriptJunio C Hamano2007-06-131-0/+2
* Merge branch 'jc/blame' (early part)Junio C Hamano2007-06-132-7/+16
|\
| * git-blame -w: ignore whitespaceJunio C Hamano2007-06-092-3/+12
| * git-blame: do not indent with spaces.Junio C Hamano2007-06-091-4/+4
* | refactor dir_add_nameJeff King2007-06-122-11/+25
* | git-remote show: Also shorten non-fast-forward refs in the 'push' listingJohannes Sixt2007-06-121-0/+1
* | gitweb: change filename/directory name of snapshotsMatthias Lederhofer2007-06-121-1/+3
* | Don't dereference a strdup-returned NULLJim Meyering2007-06-121-1/+1
* | Merge branch 'maint'Junio C Hamano2007-06-120-0/+0
|\ \
| * \ Merge branch 'ar/clone' into maintJunio C Hamano2007-06-122-1/+47
| |\ \
| * \ \ Merge branch 'sv/objfixes' into maintJunio C Hamano2007-06-122-1/+9
| |\ \ \
* | \ \ \ Merge branch 'aw/cvs'Junio C Hamano2007-06-122-21/+42
|\ \ \ \ \
| * | | | | cvsimport: add <remote>/HEAD reference in separate remotes moreAndy Whitcroft2007-06-061-0/+2
| * | | | | cvsimport: update documentation to include separate remotes optionAndy Whitcroft2007-06-062-7/+18
| * | | | | cvsimport: add support for new style remote layoutAndy Whitcroft2007-06-061-14/+22
* | | | | | Merge branch 'ep/cvstag'Junio C Hamano2007-06-121-23/+1
|\ \ \ \ \ \
| * | | | | | Use git-tag in git-cvsimportElvis Pranskevichus2007-06-061-24/+2
* | | | | | | Teach diff to imply --find-copies-harder upon -C -CJohannes Schindelin2007-06-122-3/+6
* | | | | | | Remove trailing slash from $(template_dir).Johannes Sixt2007-06-123-3/+3
* | | | | | | Avoid double-slash in path names that depend on $(sharedir).Johannes Sixt2007-06-121-1/+1
* | | | | | | Merge branch 'lh/submodule'Junio C Hamano2007-06-123-59/+78
|\ \ \ \ \ \ \
| * | | | | | | git-submodule: clone during update, not during initLars Hjemli2007-06-063-44/+51
| * | | | | | | git-submodule: move cloning into a separate functionLars Hjemli2007-06-061-16/+28
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2007-06-123-1/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Unquote From line from patch before comparing with given from address.Kristian Høgsberg2007-06-121-1/+2
| * | | | | | git-cherry: Document 'limit' command-line optionLuiz Fernando N. Capitulino2007-06-121-0/+3
| * | | | | | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-06-127-13/+28
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-06-128-12/+28
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint'Shawn O. Pearce2007-06-118-12/+28
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | git-gui: Save geometry before the window layout is damagedShawn O. Pearce2007-06-116-9/+26
| | * | | | | | | git-gui: Give amend precedence to HEAD over MERGE_MSGShawn O. Pearce2007-06-111-1/+2
| * | | | | | | | Merge branch 'maint'Shawn O. Pearce2007-06-112-3/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | git-gui: Include 'war on whitespace' fixes from git.gitShawn O. Pearce2007-06-112-3/+0
* | | | | | | | | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-06-117-52/+601
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint'Shawn O. Pearce2007-06-113-196/+786
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge branch 'maint'Shawn O. Pearce2007-06-061-10/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'maint'Shawn O. Pearce2007-06-022-15/+23
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'maint'Shawn O. Pearce2007-06-012-7/+15
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-gui: Internalize symbolic-ref HEAD reading logicShawn O. Pearce2007-05-311-20/+15
| * | | | | | | | | | | Merge branch 'maint'Shawn O. Pearce2007-05-313-5/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Shawn O. Pearce2007-05-301-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-gui: Expose the merge.diffstat configuration optionShawn O. Pearce2007-05-282-0/+2
| * | | | | | | | | | | | | git-gui: Allow users to delete remote branchesShawn O. Pearce2007-05-282-0/+350
| * | | | | | | | | | | | | git-gui: Allow users to rename branches through 'branch -m'Shawn O. Pearce2007-05-282-0/+151
| * | | | | | | | | | | | | git-gui: Disable tearoff menus on Windows, Mac OS XShawn O. Pearce2007-05-281-0/+4
| * | | | | | | | | | | | | git-gui: Provide fatal error if library is unavailableShawn O. Pearce2007-05-281-12/+19
| * | | | | | | | | | | | | git-gui: Enable verbose Tcl loading earlierShawn O. Pearce2007-05-281-14/+18
| * | | | | | | | | | | | | git-gui: Show the git-gui library path in 'About git-gui'Shawn O. Pearce2007-05-282-2/+15