3ddcb1981ba24a45c555152ecbd32b945c32a211 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/a6dbf8814f433a7fbfa9cde6333c98019f6db1e4 a6dbf8814f433a7fbfa9cde6333c98019f6db1e4 2009-09-22T22:26:27-07:00 2009-09-13T13:38:48-07:00 pull: Clarify "helpful" message for another corner case When the remote branch we asked for merging did not exist in the set of fetched refs, we unconditionally hinted that it was because of lack of configuration. It is not necessarily so, and risks sending users for a wild goose chase. Make sure to check if that is indeed the case before telling a wild guess to the user. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2574d638b867d669fbeeab5912335fee8d54ee1e Junio C Hamano gitster@pobox.com 9f040e9524c45a2f862b427ec78204625e09f50e Thiago Farina tfransosi@gmail.com http://github.com/git/git/commit/3ddcb1981ba24a45c555152ecbd32b945c32a211 3ddcb1981ba24a45c555152ecbd32b945c32a211 2009-09-22T19:40:05-07:00 2009-09-22T16:48:06-07:00 Update "describe" documentation to match reality A sample "git describe -h" did not match what the program actually says. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> e309ecabf783480a03883563417c12bcd77d62c6 Junio C Hamano gitster@pobox.com 59d5eeee9f7e0cb71c10bde3da0fa01c3b3dbf8d SZEDER Gábor szeder@ira.uka.de http://github.com/git/git/commit/9f040e9524c45a2f862b427ec78204625e09f50e 9f040e9524c45a2f862b427ec78204625e09f50e 2009-09-22T12:47:27-07:00 2009-09-15T03:21:45-07:00 bash: teach 'git reset --patch' Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01413275f8aa31e8e3fe0c88a89e7c5227fec9f4 Junio C Hamano gitster@pobox.com 918c03c2a7c8730dcfd413098b3dc05fa0f3166d SZEDER Gábor szeder@ira.uka.de http://github.com/git/git/commit/59d5eeee9f7e0cb71c10bde3da0fa01c3b3dbf8d 59d5eeee9f7e0cb71c10bde3da0fa01c3b3dbf8d 2009-09-22T12:47:26-07:00 2009-09-15T03:21:44-07:00 bash: update 'git stash' completion This update adds 'git stash (apply|pop) --quiet' and all options known to 'git stash save', and handles the DWIMery from 3c2eb80f (stash: simplify defaulting to "save" and reject unknown options, 2009-08-18). Care is taken to avoid offering subcommands in the DWIM case. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 56e0333d99b3784c28363d06a17b42f1dfb2bbbf Junio C Hamano gitster@pobox.com 3696c4ce89d97c34566a4a89720cfdae2a86fa38 SZEDER Gábor szeder@ira.uka.de http://github.com/git/git/commit/918c03c2a7c8730dcfd413098b3dc05fa0f3166d 918c03c2a7c8730dcfd413098b3dc05fa0f3166d 2009-09-22T12:47:26-07:00 2009-09-15T03:21:43-07:00 bash: rename __git_find_subcommand() to __git_find_on_cmdline() __git_find_subcommand() was originally meant to check whether subcommands are already present on the command line. But the code is general enough to be used for checking the presence of command line options as well, and the next commit will use it for that purpose, so let's give it a more general name. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 6312a54cb26c73ca16de46562551ec6971315af0 Junio C Hamano gitster@pobox.com f1e3156e627fa66714deea665c8f3585088b9695 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/3696c4ce89d97c34566a4a89720cfdae2a86fa38 3696c4ce89d97c34566a4a89720cfdae2a86fa38 2009-09-22T12:20:40-07:00 2009-09-21T12:44:05-07:00 pay attention to DESTDIR when building with NO_PERL_MAKEMAKER Building with prefix=/some/where and temporarily installing it to elsewhere for tar'ing up is done with: make prefix=/some/where make prefix=/some/where DESTDIR=/else/where install Make handcrafted perl/perl.mak without NO_PERL_MAKEMAKER honour DESTDIR. Ancient ExtUtils::MakeMaker (pre 6.11?) has the same issue, but recent versions of Perl ships with at leat 6.17; this patch does not address that issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> 484a9f07036a2a05a3f264304af88fde1d975f72 Junio C Hamano gitster@pobox.com 6426ee61c703f52ba0bea1064f028e64c7a67552 Jim Meyering meyering@redhat.com http://github.com/git/git/commit/f1e3156e627fa66714deea665c8f3585088b9695 f1e3156e627fa66714deea665c8f3585088b9695 2009-09-22T12:15:42-07:00 2009-09-21T04:00:34-07:00 pre-commit.sample: add comment re tr portability; fix grammar Add a comment explaining why square brackets around a tr range are not only ok, but actually required in this case. Correct spelling and grammar. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> a34d50ac2765204e49d50e5caaa946bd1e986c04 Junio C Hamano gitster@pobox.com a16753dc2e6f885fd30e570610c3e8cf355ecf04 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/6426ee61c703f52ba0bea1064f028e64c7a67552 6426ee61c703f52ba0bea1064f028e64c7a67552 2009-09-21T18:14:12-07:00 2009-09-21T18:14:12-07:00 Update Release Notes to 1.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> 642a77143b3782ad8d2759dc771f87a6d8d8a6dc Junio C Hamano gitster@pobox.com 0984e3a77246c536f938f53ecded99533fb31667 Johannes Sixt j6t@kdbg.org http://github.com/git/git/commit/a16753dc2e6f885fd30e570610c3e8cf355ecf04 a16753dc2e6f885fd30e570610c3e8cf355ecf04 2009-09-21T00:36:12-07:00 2009-09-21T00:34:58-07:00 test-genrandom: ensure stdout is set to _O_BINARY on Windows Commit a6ca8c62 (Set _O_BINARY as default fmode for both MinGW and MSVC) removed the definition of _CRT_fmode from mingw.c. Before this commit, since test-genrandom is linked against libgit.a, the MinGW process initialization code would pick up that definition of _CRT_fmode, which was initialized to _O_BINARY. After this commit, however, text mode is used for std(in|out|err) because it is the default in absence of _CRT_fmode. In order to fix that, we must use git-compat-util.h, which overrides main() to set the mode to binary. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> cc2bb34b6ea5cad70ba1f8c99c5c8f14eb03cd97 Junio C Hamano gitster@pobox.com 6e4ece61ff9c4c0a0c7eac43fca74ca1b5548e98 9bedb0e185332f9f8fb5e1c18bb5aff9964145a6 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/0984e3a77246c536f938f53ecded99533fb31667 0984e3a77246c536f938f53ecded99533fb31667 2009-09-20T23:47:52-07:00 2009-09-20T23:47:52-07:00 Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Work around leftover temporary save file gitk: Show diff of commits at end of compare-commits output gitk: Update Swedish translation (280t0f0u) ccc9a03bba20d2452050be826dd54a4588bd01cc Junio C Hamano gitster@pobox.com c21398be6d7b112fa3a041b4b7d869d9954bf753 Pat Thoyts patthoyts@users.sourceforge.net http://github.com/git/git/commit/9bedb0e185332f9f8fb5e1c18bb5aff9964145a6 9bedb0e185332f9f8fb5e1c18bb5aff9964145a6 2009-09-20T20:04:48-07:00 2009-09-15T02:26:30-07:00 gitk: Work around leftover temporary save file If a file exists and is hidden on Windows the Tcl open command will fail as the attributes provided in the CREAT call fail to match those of the existing file. Forcing removal of the temporary file before we begin solves any problems caused by previous failures to save the application settings. An alternative would be to remove the hidden attribute before calling 'open'. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org> ca20781e00ed3dd67f41d4384d7995ad430c52a4 Paul Mackerras paulus@samba.org f5c3178151e3963cc8cf73fdc200831850b7a632 bb8cccd01762d26c832b85d3b09798650e294c5f Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/6e4ece61ff9c4c0a0c7eac43fca74ca1b5548e98 6e4ece61ff9c4c0a0c7eac43fca74ca1b5548e98 2009-09-20T12:13:47-07:00 2009-09-20T12:13:47-07:00 Merge branch 'maint' * maint: push: Correctly initialize nonfastforward in transport_push. 2f70584aff68fbf2fa20d55db26a913769ef1600 Junio C Hamano gitster@pobox.com cb572206d9dac4ba52878e7e1a4a7028d85707ab Matthieu Moy Matthieu.Moy@imag.fr http://github.com/git/git/commit/bb8cccd01762d26c832b85d3b09798650e294c5f bb8cccd01762d26c832b85d3b09798650e294c5f 2009-09-20T12:11:29-07:00 2009-09-20T10:33:20-07:00 push: Correctly initialize nonfastforward in transport_push. The variable is assigned unconditionally in print_push_status, but print_push_status is not reached by all codepaths. In particular, this fixes a bug where "git push ... nonexisting-branch" was complaining about non-fast forward. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 364585792b070a305d72eb6dcb4d5ddc9fb68c55 Junio C Hamano gitster@pobox.com 259d87c354954e8ee3b241dce1393c27186e8ee7 Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/f5c3178151e3963cc8cf73fdc200831850b7a632 f5c3178151e3963cc8cf73fdc200831850b7a632 2009-09-18T20:00:42-07:00 2009-09-16T01:20:31-07:00 Tag GIT_VERSION when Git is built with MSVC This may help us debug issues on Windows, as we now can build Git natively on Windows with both MinGW and MSVC. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 95f5f3b430d1fc108bdc6dce3f047cb49e584faf Junio C Hamano gitster@pobox.com a2c6bf0e7661a4e6eafe7810cca1cd08187d311f Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/259d87c354954e8ee3b241dce1393c27186e8ee7 259d87c354954e8ee3b241dce1393c27186e8ee7 2009-09-18T20:00:42-07:00 2009-09-16T01:20:30-07:00 Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake) These scripts generate projects for the MSVC IDE (.vcproj files) or QMake (.pro files), based on the output of a 'make -n MSVC=1 V=1' run. This enables us to simply do the necesarry changes in the Makefile, and you can update the other buildsystems by regenerating the files. Keeping the other buildsystems up-to-date with main development. The generator system is designed to easily drop in pm's for other buildsystems as well, if someone has an itch. However, the focus has been Windows development, so the 'engine' might need patches to support any platform. Also add some .gitignore entries for MSVC files. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> c895518b9e1e09c68e1143abf9743b4cd7822d8e Junio C Hamano gitster@pobox.com 164a5e3faab931a6c6459b56acae7f91dde6337d Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/a2c6bf0e7661a4e6eafe7810cca1cd08187d311f a2c6bf0e7661a4e6eafe7810cca1cd08187d311f 2009-09-18T20:00:42-07:00 2009-09-16T01:20:29-07:00 Add README for MSVC build Based on original README patch from Frank Li, describe the steps to build git with VS2008 (aka MSVC). Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 912cbb6d862cf245c5951a513257b3e4a9d719b6 Junio C Hamano gitster@pobox.com 386ac45102df71e186d4de62b63a41ae35e71089 Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/164a5e3faab931a6c6459b56acae7f91dde6337d 164a5e3faab931a6c6459b56acae7f91dde6337d 2009-09-18T20:00:42-07:00 2009-09-16T01:20:28-07:00 Add MSVC to Makefile Enable MSVC builds with GNU Make by simply calling make MSVC=1 (Debug build possible by adding DEBUG=1 as well) Two scripts, clink.pl and lib.pl, are used to convert certain GCC specific command line options into something MSVC understands. By building for MSVC with GNU Make, we can ensure that the MSVC port always follows the latest code, and does not lag behind due to unmaintained NMake Makefile or IDE projects. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> d7c27149d5635529df9f2935411317882cb700c0 Junio C Hamano gitster@pobox.com 435bdf8c7ffa493f8f6f2e8f329f8cc22db16ce6 Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/386ac45102df71e186d4de62b63a41ae35e71089 386ac45102df71e186d4de62b63a41ae35e71089 2009-09-18T20:00:42-07:00 2009-09-16T01:20:27-07:00 Define strncasecmp and ftruncate for MSVC Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> b27cdef78900b5f1e4cc2f987f324708e85ece81 Junio C Hamano gitster@pobox.com d75f8e61315cc502c34aec6600db00a7c7192ffd Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/435bdf8c7ffa493f8f6f2e8f329f8cc22db16ce6 435bdf8c7ffa493f8f6f2e8f329f8cc22db16ce6 2009-09-18T20:00:42-07:00 2009-09-16T01:20:26-07:00 Make usage of windows.h lean and mean Centralize the include of windows.h in git-compat-util.h, turn on WIN32_LEAN_AND_MEAN to avoid including plenty of other header files which is not needed in Git. Also ensure we load winsock2.h first, so we don't load the older winsock definitions at a later stage, since they contain duplicate definitions. When moving windows.h into git-compat-util.h, we need to protect the definition of struct pollfd in mingw.h, since this file is used by both MinGW and MSVC, and the latter defines this struct in winsock2.h. We need to keep the windows.h include in compat/win32.h, since its shared by both MinGW and Cygwin, and we're not touching Cygwin in this commit. The include in git-compat-util.h is protected with an ifdef WIN32, which is not the case when compiling for Cygwin. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 99c9c20ae9a3913ea1fbf801ca1821fcb2b5e00c Junio C Hamano gitster@pobox.com 16fe1e03694e75a3923c3a757ec946aa6098aec7 Frank Li lznuaa@gmail.com http://github.com/git/git/commit/d75f8e61315cc502c34aec6600db00a7c7192ffd d75f8e61315cc502c34aec6600db00a7c7192ffd 2009-09-18T20:00:42-07:00 2009-09-16T01:20:25-07:00 Add platform files for porting to MSVC Add msvc.c and msvc.h to build git under MSVC. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 7f422cee37e8095bae10c5a9869e010a65492ed3 Junio C Hamano gitster@pobox.com 55fcb06482c9971d95f3575274a8617c0d9f5d92 Frank Li lznuaa@gmail.com http://github.com/git/git/commit/16fe1e03694e75a3923c3a757ec946aa6098aec7 16fe1e03694e75a3923c3a757ec946aa6098aec7 2009-09-18T20:00:42-07:00 2009-09-16T01:20:24-07:00 Add MinGW header files to build git with MSVC Added the header files dirent.h, unistd.h and utime.h Add alloca.h, which simply includes malloc.h, which defines alloca(). Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> bfd716656967aff84721e72f18aa9039987759e6 Junio C Hamano gitster@pobox.com 71064e3f86fbf2eb5c2b55a3024051f9542ae229 Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/55fcb06482c9971d95f3575274a8617c0d9f5d92 55fcb06482c9971d95f3575274a8617c0d9f5d92 2009-09-18T20:00:42-07:00 2009-09-16T01:20:23-07:00 Add empty header files for MSVC port MSVC lacks many of the header files included by git-compat-util.h; add blank header files for these instead of going ifdef crazy. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> f2129abcbab2728eaab0343f25e35317ca7cd3b9 Junio C Hamano gitster@pobox.com d7fa500fb598d725bda3427535e87f06caf93ee8 Frank Li lznuaa@gmail.com http://github.com/git/git/commit/71064e3f86fbf2eb5c2b55a3024051f9542ae229 71064e3f86fbf2eb5c2b55a3024051f9542ae229 2009-09-18T20:00:42-07:00 2009-09-16T01:20:22-07:00 Test for WIN32 instead of __MINGW32_ The code which is conditional on MinGW32 is actually conditional on Windows. Use the WIN32 symbol, which is defined by the MINGW32 and MSVC environments, but not by Cygwin. Define SNPRINTF_SIZE_CORR=1 for MSVC too, as its vsnprintf function does not add NUL at the end of the buffer if the result fits the buffer size exactly. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 9287bbdfe8a2196470fa7d5647f65baf82d6bbc9 Junio C Hamano gitster@pobox.com a6ca8c62467570d5d227eba4f2b838ce4b9940e8 Frank Li lznuaa@gmail.com http://github.com/git/git/commit/d7fa500fb598d725bda3427535e87f06caf93ee8 d7fa500fb598d725bda3427535e87f06caf93ee8 2009-09-18T20:00:42-07:00 2009-09-16T01:20:21-07:00 Fix __stdcall placement and function prototype MSVC requires __stdcall to be between the functions return value and the function name, and that the function pointer type is in the form of return_type (WINAPI *function_name)(arguments...) Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 763fd4ec5dff827dd9248c4619e6840769f16773 Junio C Hamano gitster@pobox.com 3f83bf3784d49e162532212230a271a8cc8edbf0 Marius Storm-Olsen marius.storm-olsen@nokia.com http://github.com/git/git/commit/a6ca8c62467570d5d227eba4f2b838ce4b9940e8 a6ca8c62467570d5d227eba4f2b838ce4b9940e8 2009-09-18T20:00:42-07:00 2009-09-16T01:20:20-07:00 Set _O_BINARY as default fmode for both MinGW and MSVC MinGW set the _CRT_fmode to set both the default fmode and _O_BINARY on stdin/stdout/stderr. Rather use the main() define in mingw.h to set this for both MinGW and MSVC. This will ensure that a MinGW and MSVC build will handle input and output identically. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> f2e77f5142850d4987fb7434b1c0074091184195 Junio C Hamano gitster@pobox.com 627735f9bf322c5c964b396f4a55d14e18d34aa2 Frank Li lznuaa@gmail.com http://github.com/git/git/commit/3f83bf3784d49e162532212230a271a8cc8edbf0 3f83bf3784d49e162532212230a271a8cc8edbf0 2009-09-18T20:00:42-07:00 2009-09-16T01:20:19-07:00 Change regerror() declaration from K&R style to ANSI C (C89) The MSVC headers typedef errcode as int, and thus confused the compiler in the K&R style definition. ANSI style deconfuses it. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 717c5f2c5e82ff8588512afc70010fd0b329f64c Junio C Hamano gitster@pobox.com 0d30ad71fa094dd89ae31b3381c2e63a41119c76 Marius Storm-Olsen mstormo@gmail.com http://github.com/git/git/commit/627735f9bf322c5c964b396f4a55d14e18d34aa2 627735f9bf322c5c964b396f4a55d14e18d34aa2 2009-09-18T20:00:42-07:00 2009-09-16T01:20:18-07:00 Add include guards to compat/win32.h Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 71d021832e01452c14b51eb2294b267ebfb27bec Junio C Hamano gitster@pobox.com 812bdbc31b246fcd5f3293e4dbac27eaec1ef4fa Frank Li lznuaa@gmail.com http://github.com/git/git/commit/0d30ad71fa094dd89ae31b3381c2e63a41119c76 0d30ad71fa094dd89ae31b3381c2e63a41119c76 2009-09-18T20:00:41-07:00 2009-09-16T01:20:17-07:00 Avoid declaration after statement MSVC does not understand this C99 style. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 83d47d51f0d0598e9cea631273b4cdd317957abc Junio C Hamano gitster@pobox.com 1f986c4ac4df6fcac4b19bc9cd3a8b6c8f0ffdea Thiago Farina tfransosi@gmail.com http://github.com/git/git/commit/812bdbc31b246fcd5f3293e4dbac27eaec1ef4fa 812bdbc31b246fcd5f3293e4dbac27eaec1ef4fa 2009-09-18T19:48:48-07:00 2009-09-18T12:11:52-07:00 pack-objects: remove SP at the end of usage string These spaces immediately before the end of lines are unnecessary. While at it, instead of using a single string literal with backslashes at end of each line, split the lines into individual string literals and tell the compiler to concatenate them. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> fada4fead8571a3c25cfca79dfd189bf4842314a Junio C Hamano gitster@pobox.com e481b1d8db9947681a5c124545ef06951f42155d Thiago Farina tfransosi@gmail.com http://github.com/git/git/commit/1f986c4ac4df6fcac4b19bc9cd3a8b6c8f0ffdea 1f986c4ac4df6fcac4b19bc9cd3a8b6c8f0ffdea 2009-09-18T19:47:15-07:00 2009-09-17T10:20:53-07:00 Update the usage bundle string. "git bundle -h" gives a single long line that is hard to read. Rewrite it into a multi-line format similar to the one used by other commands, e.g "git stash -h". Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12afcdd057ebe4127ac01549a1157d7926befda5 Junio C Hamano gitster@pobox.com