git, branch v1.5.2-rc3Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v1.5.2-rc32007-05-10T22:22:02ZGIT v1.5.2-rc32007-05-10T22:22:02ZJunio C Hamanojunkio@cox.net2007-05-10T21:49:36Zurn:sha1:843142ada000a992fa87bd2dc7796501332a52d9
Signed-off-by: Junio C Hamano <junkio@cox.net>
Document 'git-log --decorate'2007-05-10T22:21:54ZMichael Hendricksmichael@ndrix.org2007-05-10T22:09:38Zurn:sha1:56822cc9ab9003c80b18201c097e4faa6f0ffbd3
Signed-off-by: Michael Hendricks <michael@ndrix.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Correct error message in revert/cherry-pick2007-05-10T22:21:50ZShawn O. Pearcespearce@spearce.org2007-05-10T22:10:36Zurn:sha1:1dcb3b6478cac3d301349c2df4af2e5ec69dfffe
We now write to MERGE_MSG, not .msg. I missed this earlier
when I changed the target we write to.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Merge branch 'master' of git://repo.or.cz/git-gui2007-05-10T22:08:18ZJunio C Hamanojunkio@cox.net2007-05-10T22:08:18Zurn:sha1:2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5
* 'master' of git://repo.or.cz/git-gui:
git gui 0.7.0
git-gui: Paperbag fix blame in subdirectory
git-gui: Format author/committer times in ISO format
git-gui: Cleanup minor nits in blame code
git-gui: Generate blame on uncommitted working tree file
git-gui: Smarter command line parsing for browser, blame
git-gui: Use prefix if blame is run in a subdirectory
git-gui: Convert blame to the "class" way of doing things
git-gui: Don't attempt to inline array reads in methods
git-gui: Convert browser, console to "class" format
git-gui: Define a simple class/method system
git-gui: Allow shift-{k,j} to select a range of branches to merge
git-gui: Call changes "Staged" and "Unstaged" in file list titles.
git gui 0.7.02007-05-10T21:54:45ZShawn O. Pearcespearce@spearce.org2007-05-10T21:54:45Zurn:sha1:d6da71a9d16b8cf27f9d8f90692d3625c849cbc8
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui: Paperbag fix blame in subdirectory2007-05-10T21:53:34ZShawn O. Pearcespearce@spearce.org2007-05-09T22:35:04Zurn:sha1:6b3d8b97cb48bcc6e2ac020312a56e1d9a2828b2
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Merge branch 'maint'2007-05-10T21:48:04ZJunio C Hamanojunkio@cox.net2007-05-10T21:48:04Zurn:sha1:ffcc952b33575e28b971d63ba2b7e46b7726a257
* maint:
Fix documentation of tag in git-fast-import.txt
Properly handle '0' filenames in import-tars
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint2007-05-10T21:47:14ZJunio C Hamanojunkio@cox.net2007-05-10T21:47:14Zurn:sha1:a9d9a1bfdddd5f177617abc943fba10f6cc68066
* 'maint' of git://repo.or.cz/git/fastimport:
Fix documentation of tag in git-fast-import.txt
Properly handle '0' filenames in import-tars
Fix documentation of tag in git-fast-import.txt2007-05-10T21:32:40ZRichard P. Curnowrc@rc0.org.uk2007-05-09T22:13:44Zurn:sha1:419ca50e4c5afbf6a3f956db5531ed85f2b54bb9
The tag command does not take a trailing LF.
Signed-off-by: Richard P. Curnow <rc@rc0.org.uk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Merge branch 'gfi-maint' into maint2007-05-10T21:31:27ZShawn O. Pearcespearce@spearce.org2007-05-10T21:31:27Zurn:sha1:da774e82726209cbdb806566e93ff728c83ad7ab
* gfi-maint:
Properly handle '0' filenames in import-tars