git, branch v1.6.2Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v1.6.22009-03-04T07:37:19ZGIT 1.6.22009-03-04T07:37:19ZJunio C Hamanogitster@pobox.com2009-03-04T07:02:16Zurn:sha1:a95148dea1d9546e96adef7c3cad11be80aa30f5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation: Typo / spelling / formatting fixes2009-03-04T05:43:19ZMike Ralphsonmike@abacus.co.uk2009-03-03T19:29:22Zurn:sha1:a1070d4cbbf1002cc0b01afc3de06382deb0511a
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation: Expand a couple of abbreviations2009-03-04T05:42:44ZMike Ralphsonmike@abacus.co.uk2009-03-03T19:29:21Zurn:sha1:5a4aaaf3aa2ef02b6b397206cf222643b68b36c7
These may not be obvious to non-native English speakers
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation: Typos / spelling fixes in RelNotes2009-03-04T05:40:36ZMike Ralphsonmike@abacus.co.uk2009-03-03T19:29:20Zurn:sha1:c0bc2eeb1e03593ca816f63deda662da5a25ab83
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-archive.txt: Note attributes2009-03-04T04:16:49ZRoy Leeroylee17@gmail.com2009-03-03T16:49:29Zurn:sha1:8d1b9d23a04f43f45bd3b20616936fcdd3021446
Signed-off-by: Roy Lee <roylee17@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation: minor grammatical fixes.2009-03-02T20:34:56ZDavid J. Mellordmellor@whistlingcat.com2009-03-02T06:42:44Zurn:sha1:1d035f85649cbb0a4fcc3e341f7e854acf9cf3c1
The final hunk in this patch corrects what appears to be a typo:
of --> or
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation: minor grammatical fixes.2009-03-02T20:34:54ZDavid J. Mellordmellor@whistlingcat.com2009-03-02T06:38:36Zurn:sha1:a7d64b52da7a843a1113f7e9cc624b4dee0e5f40
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation: minor grammatical fixes.2009-03-02T20:34:53ZDavid J. Mellordmellor@whistlingcat.com2009-03-02T06:37:41Zurn:sha1:07f5746fb580203f0d38a7828190a51a0c32d884
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t3400-rebase: Move detached HEAD check earlier2009-03-02T07:58:41ZJohannes Sixtj6t@kdbg.org2009-03-01T10:20:03Zurn:sha1:2559bff32cc5c49d6e9bf3f773358e96af9e47fd
Short story: There is a section in t3400 that tests fundamental rebase
properties. 3ec7371f (Add two extra tests for git rebase, 2009-02-09)
added a check that rebase works on a detached HEAD, but the test was put
near the end of the file. This moves it to a more suitable place.
Long story: The test that preceded the one in question tests that a
rebased commit degrades from a content change with mode change to a
mere mode change. But on Windows, where we have core.filemode=false,
the original commit did not record the mode change, and so the rebase
operation did not rebase anything. This caused the subsequent detached
HEAD test to fail.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge git://git.kernel.org/pub/scm/gitk/gitk2009-03-02T06:20:52ZJunio C Hamanogitster@pobox.com2009-03-02T06:20:52Zurn:sha1:f8c62880ef22b74ea6df47bb349ff0743d2a93f9
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Fix possible infinite loop and display corruption