From 1e61b7640d09015213dbcae3564fa27ac6a8c151 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 3 Sep 2007 02:40:06 -0700 Subject: Start 1.5.4 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Documentation/RelNotes-1.5.4.txt (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt new file mode 100644 index 0000000000..1df66af9ce --- /dev/null +++ b/Documentation/RelNotes-1.5.4.txt @@ -0,0 +1,14 @@ +GIT v1.5.4 Release Notes +======================== + +Updates since v1.5.3 +-------------------- + + + +Fixes since v1.5.3 +------------------ + +All of the fixes in v1.5.3 maintenance series are included in +this release, unless otherwise noted. + -- cgit v1.2.3 From bc12651b08fe295ac5647208f9b3f946145cc9b1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 24 Sep 2007 01:12:16 -0700 Subject: Start RelNotes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 1df66af9ce..ceee857232 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -4,7 +4,22 @@ GIT v1.5.4 Release Notes Updates since v1.5.3 -------------------- + * git-reset is now built-in. + * git-send-email can optionally talk over ssmtp and use SMTP-AUTH. + + * git-rebase learned --whitespace option. + + * git-remote knows --mirror mode. + + * git-merge can call the "post-merge" hook. + + * git-pack-objects can optionally run deltification with multiple threads. + + * git-archive can optionally substitute keywords in files marked with + export-subst attribute. + + * Various Perforce importer updates. Fixes since v1.5.3 ------------------ @@ -12,3 +27,9 @@ Fixes since v1.5.3 All of the fixes in v1.5.3 maintenance series are included in this release, unless otherwise noted. +-- +exec >/var/tmp/1 +O=v1.5.3.2-99-ge4b2890 +echo O=`git describe refs/heads/master` +git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint + -- cgit v1.2.3 From 79f3368d9a1bba022f38806b67c25ffffc0e7e92 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 29 Oct 2007 13:09:01 -0700 Subject: RelNotes-1.5.4: describe recent updates Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index ceee857232..133fa64d22 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -4,6 +4,8 @@ GIT v1.5.4 Release Notes Updates since v1.5.3 -------------------- + * Comes with much improved gitk. + * git-reset is now built-in. * git-send-email can optionally talk over ssmtp and use SMTP-AUTH. @@ -19,6 +21,29 @@ Updates since v1.5.3 * git-archive can optionally substitute keywords in files marked with export-subst attribute. + * git-for-each-ref learned %(xxxdate:) syntax to + show the various date fields in different formats. + + * git-gc --auto is a low-impact way to automatically run a + variant of git-repack that does not lose unreferenced objects + (read: safer than the usual one) after the user accumulates + too many loose objects. + + * git-push has been rewritten in C. + + * git-push learned --dry-run option to show what would happen + if a push is run. + + * git-remote learned "rm" subcommand. + + * git-rebase --interactive mode can now work on detached HEAD. + + * git-cvsserver can be run via git-shell. + + * git-am and git-rebase are far less verbose. + + * git-pull learned to pass --[no-]ff option to underlying git-merge. + * Various Perforce importer updates. Fixes since v1.5.3 @@ -29,7 +54,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3.2-99-ge4b2890 +O=v1.5.3.4-450-g952a9e5 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint - -- cgit v1.2.3 From fc8b5f0307d5477cb4a52d3b54ff098f8ea34c8e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 8 Nov 2007 00:41:22 +0000 Subject: Deprecate git-lost-found "git fsck" learnt the option "--lost-found" in v1.5.3-rc0~5, to make "git lost-found" obsolete. It is time to deprecate "git lost-found". Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 133fa64d22..65dd1b0a2d 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -46,6 +46,9 @@ Updates since v1.5.3 * Various Perforce importer updates. + * git-lost-found was deprecated in favor of git-fsck's --lost-found + option. + Fixes since v1.5.3 ------------------ -- cgit v1.2.3 From c238dad407aec1ccf6e364f9c95e10e7f84eac8f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 9 Nov 2007 00:32:38 -0800 Subject: Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 65dd1b0a2d..93fb9c914c 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -6,7 +6,10 @@ Updates since v1.5.3 * Comes with much improved gitk. - * git-reset is now built-in. + * "progress display" from many commands are a lot nicer to the + eye. Transfer commands show throughput data. + + * git-reset is now built-in and its output can be squelched with -q. * git-send-email can optionally talk over ssmtp and use SMTP-AUTH. @@ -49,6 +52,25 @@ Updates since v1.5.3 * git-lost-found was deprecated in favor of git-fsck's --lost-found option. + * git-svnimport was removed in favor of git-svn. + + * git-bisect learned "skip" action to mark untestable commits. + + * rename detection diff family, while detecting exact matches, + has been greatly optimized. + + * Example update and post-receive hooks have been improved. + + * In addition there are quite a few internal clean-ups. Notably + + - many fork/exec have been replaced with run-command API, + brought from the msysgit effort. + + - introduction and more use of the option parser API. + + - enhancement and more use of the strbuf API. + + Fixes since v1.5.3 ------------------ @@ -57,6 +79,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3.4-450-g952a9e5 +O=v1.5.3.5-618-g5d4138a echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint -- cgit v1.2.3 From dee1b1ea9e1b0b889d9c53c2501e7f6250703341 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 16 Nov 2007 21:47:59 -0800 Subject: Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 93fb9c914c..229d773423 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -32,6 +32,10 @@ Updates since v1.5.3 (read: safer than the usual one) after the user accumulates too many loose objects. + * You need to explicitly set clean.requireForce to true to allow + git-clean to do any damage now (the configuration variable used + to default to false). + * git-push has been rewritten in C. * git-push learned --dry-run option to show what would happen @@ -56,7 +60,28 @@ Updates since v1.5.3 * git-bisect learned "skip" action to mark untestable commits. - * rename detection diff family, while detecting exact matches, + * git-format-patch learned "format.numbered" configuration variable + to automatically turn --numbered option on when more than one + commits are formatted. + + * git-ls-files learned "--exclude-standard" to use the canned + set of exclude files. + + * git-rebase now detaches head during its operation, so after a + successful "git rebase" operation, the reflog entry branch@{1} + for the current branch points at the commit before the rebase + was started. + + * "git-tag -a -f existing" begins the editor session using the + existing annotation message. + + * "git cvsexportcommit" learned -w option to specify and switch + to the CVS working directory. + + * Output processing for '--pretty=format:' has + been optimized. + + * Rename detection diff family, while detecting exact matches, has been greatly optimized. * Example update and post-receive hooks have been improved. @@ -77,8 +102,11 @@ Fixes since v1.5.3 All of the fixes in v1.5.3 maintenance series are included in this release, unless otherwise noted. + * git-svn talking with the SVN over http will correctly quote branch + and project names. + -- exec >/var/tmp/1 -O=v1.5.3.5-618-g5d4138a +O=v1.5.3.5-736-geb9d2b9 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint -- cgit v1.2.3 From 41d8a5f0f7db6e1d92f925234eb8c55d2d34a5af Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 18 Nov 2007 15:22:51 -0800 Subject: Draft release notes: fix clean.requireForce description Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 229d773423..7f7d4273e2 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -32,9 +32,9 @@ Updates since v1.5.3 (read: safer than the usual one) after the user accumulates too many loose objects. - * You need to explicitly set clean.requireForce to true to allow - git-clean to do any damage now (the configuration variable used - to default to false). + * You need to explicitly set clean.requireForce to "false" to allow + git-clean to do any damage (lack of the configuration variable + used to mean "do not require", but we now use the safer default). * git-push has been rewritten in C. @@ -107,6 +107,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3.5-736-geb9d2b9 +O=v1.5.3.6-706-gcb02958 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint -- cgit v1.2.3 From ea55960518bb104020c02aa2f64b33f93d1775e7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 18 Nov 2007 16:24:14 -0800 Subject: Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 7f7d4273e2..96ec55eb1c 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -56,6 +56,9 @@ Updates since v1.5.3 * git-lost-found was deprecated in favor of git-fsck's --lost-found option. + * "git log" learned --early-output option to help interactive + GUI implementations. + * git-svnimport was removed in favor of git-svn. * git-bisect learned "skip" action to mark untestable commits. @@ -78,6 +81,10 @@ Updates since v1.5.3 * "git cvsexportcommit" learned -w option to specify and switch to the CVS working directory. + * "git checkout" from a subdirectory learned to use "../path" + to allow checking out a path outside the current directory + without cd'ing up. + * Output processing for '--pretty=format:' has been optimized. @@ -105,8 +112,12 @@ this release, unless otherwise noted. * git-svn talking with the SVN over http will correctly quote branch and project names. + * "git rev-list --objects A..B" choked when the lower boundary + of the range involved a subproject. This fix is also queued + for 'maint' (but not in there yet). + -- exec >/var/tmp/1 -O=v1.5.3.6-706-gcb02958 +O=v1.5.3.6-727-g5d3d1ca echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint -- cgit v1.2.3 From 8d3f1743103daafab20b6c7b34c1690ecc5af837 Mon Sep 17 00:00:00 2001 From: Wincent Colaiuta Date: Mon, 19 Nov 2007 09:06:31 +0100 Subject: Further clarify clean.requireForce changes Mention the -f switch in the release notes for clean.requireForce to avoid possible misunderstandings. Signed-off-by: Wincent Colaiuta Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 96ec55eb1c..a4a2a7f429 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -33,8 +33,9 @@ Updates since v1.5.3 too many loose objects. * You need to explicitly set clean.requireForce to "false" to allow - git-clean to do any damage (lack of the configuration variable - used to mean "do not require", but we now use the safer default). + git-clean without -f to do any damage (lack of the configuration + variable used to mean "do not require", but we now use the safer + default). * git-push has been rewritten in C. -- cgit v1.2.3 From 92b7ba16b7605f70cac845d4a8d0162392ac0223 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 24 Nov 2007 17:42:36 -0800 Subject: Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index a4a2a7f429..ff4d3d82b0 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -6,6 +6,14 @@ Updates since v1.5.3 * Comes with much improved gitk. + * Comes with git-gui 0.9.0 with i18n. + + * git-lost-found was deprecated in favor of git-fsck's --lost-found + option. + + * git-peek-remote is deprecated, as git-ls-remote was written in C and + works for all transports. + * "progress display" from many commands are a lot nicer to the eye. Transfer commands show throughput data. @@ -15,6 +23,11 @@ Updates since v1.5.3 * git-rebase learned --whitespace option. + * In git-rebase, when you decide not to replay a particular change + after the command stopped with a conflict, you can say "git-rebase + --skip" without first running "git reset --hard", as the command now + run it for you. + * git-remote knows --mirror mode. * git-merge can call the "post-merge" hook. @@ -37,11 +50,20 @@ Updates since v1.5.3 variable used to mean "do not require", but we now use the safer default). + * git-clean has been rewritten in C. + * git-push has been rewritten in C. * git-push learned --dry-run option to show what would happen if a push is run. + * git-push does not update a tracking ref on the pushing side when the + remote refused to update the corresponding ref. + + * git-push learned --mirror option. This is to push the local refs + one-to-one to the remote, and deletes refs from the remote that do + not exist anymore in the repository on the pushing side. + * git-remote learned "rm" subcommand. * git-rebase --interactive mode can now work on detached HEAD. @@ -54,9 +76,6 @@ Updates since v1.5.3 * Various Perforce importer updates. - * git-lost-found was deprecated in favor of git-fsck's --lost-found - option. - * "git log" learned --early-output option to help interactive GUI implementations. @@ -86,6 +105,17 @@ Updates since v1.5.3 to allow checking out a path outside the current directory without cd'ing up. + * "git send-email --dry-run" shows full headers for easier + diagnosis. + + * "git merge-ours" is built-in. + + * "git svn" learned "info" subcommand. + + * "git status" from a subdirectory now shows relative paths + which makes copy-and-pasting for git-checkout/git-add/git-rm + easier. + * Output processing for '--pretty=format:' has been optimized. @@ -119,6 +149,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3.6-727-g5d3d1ca +O=v1.5.3.6-950-gda03a58 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint -- cgit v1.2.3 From e0fda6abd11c567b72f29ec0ee06c541404a9cb7 Mon Sep 17 00:00:00 2001 From: Wincent Colaiuta Date: Mon, 26 Nov 2007 09:34:48 +0100 Subject: Fix typo in draft 1.5.4 release notes Signed-off-by: Wincent Colaiuta Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index ff4d3d82b0..c9c537649f 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -26,7 +26,7 @@ Updates since v1.5.3 * In git-rebase, when you decide not to replay a particular change after the command stopped with a conflict, you can say "git-rebase --skip" without first running "git reset --hard", as the command now - run it for you. + runs it for you. * git-remote knows --mirror mode. -- cgit v1.2.3 From 2221a6757161af1905925c405aded9ff470f70d5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 1 Dec 2007 13:13:11 -0800 Subject: Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 61 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 4 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index c9c537649f..192766f868 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -1,6 +1,36 @@ GIT v1.5.4 Release Notes ======================== +Deprecation notices +------------------- + + * Next feature release of git (this change is scheduled for v1.5.5 but + it could slip) will by default install dashed form of commands + (e.g. "git-commit") outside of users' normal $PATH, and will install + only selected commands ("git" itself, and "gitk") in $PATH. This + implies: + + - Using dashed form of git commands (e.g. "git-commit") from the + command line has been informally deprecated since early 2006, but + now it officially is, and will be removed in the future. Use + dashless form (e.g. "git commit") instead. + + - Using dashed from from your scripts, without first prepending the + return value from "git --exec-path" to the scripts' PATH, has been + informally deprecated since early 2006, but now it officially is. + + - Use of dashed form with "PATH=$(git --exec-path):$PATH; export + PATH" early in your script is not deprecated with this change. + + Users are strongly encouraged to adjust their habits and scripts now + to prepare for this. + + * The post-receive hook was introduced in March 2007 to supersede + post-update hook, primarily to overcome the command line length + limitation of the latter. Use of post-update hook will be deprecated + in future versions of git, perhaps in v1.5.5. + + Updates since v1.5.3 -------------------- @@ -14,9 +44,16 @@ Updates since v1.5.3 * git-peek-remote is deprecated, as git-ls-remote was written in C and works for all transports. + * git-cherry-pick made a misguided attempt to repeat the original + command line in the generated log message, when told to cherry-pick a + commit by naming a tag that points at it. It does not anymore. + * "progress display" from many commands are a lot nicer to the eye. Transfer commands show throughput data. + * many commands that pay attention to per-directory .gitignore now do + so lazily, which makes the usual case go much faster. + * git-reset is now built-in and its output can be squelched with -q. * git-send-email can optionally talk over ssmtp and use SMTP-AUTH. @@ -110,20 +147,36 @@ Updates since v1.5.3 * "git merge-ours" is built-in. - * "git svn" learned "info" subcommand. + * "git svn" learned "info" and "show-externals" subcommands. + + * calling "git svn" from a subdirectory failed read settings from the + .git/config. + + * "git svn" learned --use-log-author option, which picks up more + descriptive name from From: and Signed-off-by: lines in the commit + message. * "git status" from a subdirectory now shows relative paths which makes copy-and-pasting for git-checkout/git-add/git-rm easier. + * "git checkout" from and to detached HEAD leaves a bit more + information in the reflog. + * Output processing for '--pretty=format:' has been optimized. - * Rename detection diff family, while detecting exact matches, - has been greatly optimized. + * Rename detection of diff family, while detecting exact matches, has + been greatly optimized. + + * Rename detection of diff family tries to make more naturally looking + pairing. Earlier if more than one identical rename sources were + found in the preimage, they were picked pretty much at random. * Example update and post-receive hooks have been improved. + * A corrupt ref at the remote site can be removed via "git push". + * In addition there are quite a few internal clean-ups. Notably - many fork/exec have been replaced with run-command API, @@ -149,6 +202,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3.6-950-gda03a58 +O=v1.5.3.7-948-gb52e985 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint -- cgit v1.2.3 From 1c46ab1fada6eb449336a624995293cdd74f2b08 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 1 Dec 2007 23:45:31 -0800 Subject: Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 184 +++++++++++++++++++++------------------ 1 file changed, 98 insertions(+), 86 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 192766f868..44f5043ce7 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -1,6 +1,12 @@ GIT v1.5.4 Release Notes ======================== +Removal +------- + + * "git svnimport" was removed in favor of "git svn". + + Deprecation notices ------------------- @@ -30,152 +36,159 @@ Deprecation notices limitation of the latter. Use of post-update hook will be deprecated in future versions of git, perhaps in v1.5.5. + * "git lost-found" was deprecated in favor of "git fsck"'s --lost-found + option, and will be removed in the future. + + * "git peek-remote" is deprecated, as "git ls-remote" was written in C + and works for all transports, and will be removed in the future. + Updates since v1.5.3 -------------------- * Comes with much improved gitk. - * Comes with git-gui 0.9.0 with i18n. + * Comes with "git gui" 0.9.0 with i18n. - * git-lost-found was deprecated in favor of git-fsck's --lost-found - option. + * progress display from many commands are a lot nicer to the eye. + Transfer commands show throughput data. - * git-peek-remote is deprecated, as git-ls-remote was written in C and - works for all transports. + * many commands that pay attention to per-directory .gitignore now do + so lazily, which makes the usual case go much faster. - * git-cherry-pick made a misguided attempt to repeat the original - command line in the generated log message, when told to cherry-pick a - commit by naming a tag that points at it. It does not anymore. + * Output processing for '--pretty=format:' has been + optimized. - * "progress display" from many commands are a lot nicer to the - eye. Transfer commands show throughput data. + * Rename detection of diff family, while detecting exact matches, has + been greatly optimized. - * many commands that pay attention to per-directory .gitignore now do - so lazily, which makes the usual case go much faster. + * Rename detection of diff family tries to make more naturally looking + pairing. Earlier if more than one identical rename sources were + found in the preimage, they were picked pretty much at random. - * git-reset is now built-in and its output can be squelched with -q. + * "git reset" is now built-in and its output can be squelched with -q. - * git-send-email can optionally talk over ssmtp and use SMTP-AUTH. + * "git send-email" can optionally talk over ssmtp and use SMTP-AUTH. - * git-rebase learned --whitespace option. + * "git rebase" learned --whitespace option. - * In git-rebase, when you decide not to replay a particular change - after the command stopped with a conflict, you can say "git-rebase + * In "git rebase", when you decide not to replay a particular change + after the command stopped with a conflict, you can say "git rebase --skip" without first running "git reset --hard", as the command now runs it for you. - * git-remote knows --mirror mode. + * "git merge" can call the "post-merge" hook. - * git-merge can call the "post-merge" hook. + * "git pack-objects" can optionally run deltification with multiple + threads. - * git-pack-objects can optionally run deltification with multiple threads. - - * git-archive can optionally substitute keywords in files marked with + * "git archive" can optionally substitute keywords in files marked with export-subst attribute. - * git-for-each-ref learned %(xxxdate:) syntax to - show the various date fields in different formats. + * "git cherry-pick" made a misguided attempt to repeat the original + command line in the generated log message, when told to cherry-pick a + commit by naming a tag that points at it. It does not anymore. - * git-gc --auto is a low-impact way to automatically run a - variant of git-repack that does not lose unreferenced objects - (read: safer than the usual one) after the user accumulates - too many loose objects. + * "git for-each-ref" learned %(xxxdate:) syntax to show the + various date fields in different formats. - * You need to explicitly set clean.requireForce to "false" to allow - git-clean without -f to do any damage (lack of the configuration - variable used to mean "do not require", but we now use the safer - default). + * "git gc --auto" is a low-impact way to automatically run a variant of + "git repack" that does not lose unreferenced objects (read: safer + than the usual one) after the user accumulates too many loose + objects. - * git-clean has been rewritten in C. + * You need to explicitly set clean.requireForce to "false" to allow + "git clean" without -f to do any damage (lack of the configuration + variable used to mean "do not require -f option to lose untracked + files", but we now use the safer default). - * git-push has been rewritten in C. + * "git clean" has been rewritten in C. - * git-push learned --dry-run option to show what would happen - if a push is run. + * "git push" learned --dry-run option to show what would happen if a + push is run. - * git-push does not update a tracking ref on the pushing side when the + * "git push" does not update a tracking ref on the local side when the remote refused to update the corresponding ref. - * git-push learned --mirror option. This is to push the local refs + * "git push" learned --mirror option. This is to push the local refs one-to-one to the remote, and deletes refs from the remote that do not exist anymore in the repository on the pushing side. - * git-remote learned "rm" subcommand. + * "git remote" knows --mirror mode. This is to set up configuration to + push into a remote repository to store local branch heads to the same + branch on the remote side, and remove branch heads locally removed + from local repository at the same time. Suitable for pushing into a + back-up repository. + + * "git remote" learned "rm" subcommand. - * git-rebase --interactive mode can now work on detached HEAD. + * "git rebase --interactive" mode can now work on detached HEAD. - * git-cvsserver can be run via git-shell. + * "git cvsserver" can be run via "git shell". - * git-am and git-rebase are far less verbose. + * "git am" and "git rebase" are far less verbose. - * git-pull learned to pass --[no-]ff option to underlying git-merge. + * "git pull" learned to pass --[no-]ff option to underlying "git + merge". * Various Perforce importer updates. - * "git log" learned --early-output option to help interactive - GUI implementations. + * "git log" learned --early-output option to help interactive GUI + implementations. - * git-svnimport was removed in favor of git-svn. + * "git bisect" learned "skip" action to mark untestable commits. - * git-bisect learned "skip" action to mark untestable commits. + * "git format-patch" learned "format.numbered" configuration variable + to automatically turn --numbered option on when more than one commits + are formatted. - * git-format-patch learned "format.numbered" configuration variable - to automatically turn --numbered option on when more than one - commits are formatted. + * "git ls-files" learned "--exclude-standard" to use the canned set of + exclude files. - * git-ls-files learned "--exclude-standard" to use the canned - set of exclude files. + * "git rebase" now detaches head during its operation, so after a + successful "git rebase" operation, the reflog entry branch@{1} for + the current branch points at the commit before the rebase was + started. - * git-rebase now detaches head during its operation, so after a - successful "git rebase" operation, the reflog entry branch@{1} - for the current branch points at the commit before the rebase - was started. + * "git tag -a -f existing" begins the editor session using the existing + annotation message. - * "git-tag -a -f existing" begins the editor session using the - existing annotation message. + * "git tag -m one -m bar" (multiple -m options) behaves similarly to + "git commit"; the parameters to -m options are formatted as separate + paragraphs. - * "git cvsexportcommit" learned -w option to specify and switch - to the CVS working directory. + * "git cvsexportcommit" learned -w option to specify and switch to the + CVS working directory. - * "git checkout" from a subdirectory learned to use "../path" - to allow checking out a path outside the current directory - without cd'ing up. + * "git checkout" from a subdirectory learned to use "../path" to allow + checking out a path outside the current directory without cd'ing up. - * "git send-email --dry-run" shows full headers for easier - diagnosis. + * "git send-email --dry-run" shows full headers for easier diagnosis. - * "git merge-ours" is built-in. + * "git merge-ours" is now built-in. * "git svn" learned "info" and "show-externals" subcommands. - * calling "git svn" from a subdirectory failed read settings from the + * "git svn" run from a subdirectory failed to read settings from the .git/config. * "git svn" learned --use-log-author option, which picks up more descriptive name from From: and Signed-off-by: lines in the commit message. - * "git status" from a subdirectory now shows relative paths - which makes copy-and-pasting for git-checkout/git-add/git-rm - easier. + * "git status" from a subdirectory now shows relative paths which makes + copy-and-pasting for git-checkout/git-add/git-rm easier. * "git checkout" from and to detached HEAD leaves a bit more information in the reflog. - * Output processing for '--pretty=format:' has - been optimized. - - * Rename detection of diff family, while detecting exact matches, has - been greatly optimized. - - * Rename detection of diff family tries to make more naturally looking - pairing. Earlier if more than one identical rename sources were - found in the preimage, they were picked pretty much at random. + * "git branch" learned --contains option, to show only branches that + can reach a given commit. * Example update and post-receive hooks have been improved. - * A corrupt ref at the remote site can be removed via "git push". + * "git push" can remove a corrupt ref at the remote site with the usual + ":ref" refspec. * In addition there are quite a few internal clean-ups. Notably @@ -193,15 +206,14 @@ Fixes since v1.5.3 All of the fixes in v1.5.3 maintenance series are included in this release, unless otherwise noted. - * git-svn talking with the SVN over http will correctly quote branch - and project names. +These fixes are only in v1.5.4 and not backported to v1.5.3 maintenance +series. - * "git rev-list --objects A..B" choked when the lower boundary - of the range involved a subproject. This fix is also queued - for 'maint' (but not in there yet). + * "git svn" talking with the SVN over http will correctly quote branch + and project names. -- exec >/var/tmp/1 -O=v1.5.3.7-948-gb52e985 +O=v1.5.3.7-966-g6bda21b echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint -- cgit v1.2.3 From afc67036de4c6f27234243dded05d7dd9398eea5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 3 Dec 2007 23:13:02 -0800 Subject: Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.txt | 79 +++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 21 deletions(-) (limited to 'Documentation/RelNotes-1.5.4.txt') diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt index 44f5043ce7..c40fd1805f 100644 --- a/Documentation/RelNotes-1.5.4.txt +++ b/Documentation/RelNotes-1.5.4.txt @@ -4,7 +4,8 @@ GIT v1.5.4 Release Notes Removal ------- - * "git svnimport" was removed in favor of "git svn". + * "git svnimport" was removed in favor of "git svn". It is still there + in the source tree (contrib/examples) but unsupported. Deprecation notices @@ -48,7 +49,10 @@ Updates since v1.5.3 * Comes with much improved gitk. - * Comes with "git gui" 0.9.0 with i18n. + * Comes with "git gui" 0.9.1 with i18n. + + * gitk is now merged as a subdirectory of git.git project, in + preparation for its i18n. * progress display from many commands are a lot nicer to the eye. Transfer commands show throughput data. @@ -66,6 +70,21 @@ Updates since v1.5.3 pairing. Earlier if more than one identical rename sources were found in the preimage, they were picked pretty much at random. + * Value "true" for color.diff and color.status configuration used to + mean "always" (even when the output is not going to a terminal). + This has been corrected to mean the same thing as "auto". + + * HTTP proxy can be specified per remote repository using + remote.*.httpproxy configuration, or global http.proxy configuration + variable. + + * Various Perforce importer updates. + + * Example update and post-receive hooks have been improved. + + * Any command that wants to take a commit object name can now use + ":/string" syntax to name a commit. + * "git reset" is now built-in and its output can be squelched with -q. * "git send-email" can optionally talk over ssmtp and use SMTP-AUTH. @@ -77,6 +96,15 @@ Updates since v1.5.3 --skip" without first running "git reset --hard", as the command now runs it for you. + * "git rebase --interactive" mode can now work on detached HEAD. + + * "git rebase" now detaches head during its operation, so after a + successful "git rebase" operation, the reflog entry branch@{1} for + the current branch points at the commit before the rebase was + started. + + * "git rebase -i" also triggers rerere to help your repeated merges. + * "git merge" can call the "post-merge" hook. * "git pack-objects" can optionally run deltification with multiple @@ -97,13 +125,13 @@ Updates since v1.5.3 than the usual one) after the user accumulates too many loose objects. + * "git clean" has been rewritten in C. + * You need to explicitly set clean.requireForce to "false" to allow "git clean" without -f to do any damage (lack of the configuration variable used to mean "do not require -f option to lose untracked files", but we now use the safer default). - * "git clean" has been rewritten in C. - * "git push" learned --dry-run option to show what would happen if a push is run. @@ -114,6 +142,9 @@ Updates since v1.5.3 one-to-one to the remote, and deletes refs from the remote that do not exist anymore in the repository on the pushing side. + * "git push" can remove a corrupt ref at the remote site with the usual + ":ref" refspec. + * "git remote" knows --mirror mode. This is to set up configuration to push into a remote repository to store local branch heads to the same branch on the remote side, and remove branch heads locally removed @@ -122,8 +153,6 @@ Updates since v1.5.3 * "git remote" learned "rm" subcommand. - * "git rebase --interactive" mode can now work on detached HEAD. - * "git cvsserver" can be run via "git shell". * "git am" and "git rebase" are far less verbose. @@ -131,7 +160,28 @@ Updates since v1.5.3 * "git pull" learned to pass --[no-]ff option to underlying "git merge". - * Various Perforce importer updates. + * "git pull --rebase" is a different way to integrate what you fetched + into your current branch. + + * "git fast-export" produces datastream that can be fed to fast-import + to reproduce the history recorded in a git repository. + + * "git commit --allow-empty" allows you to create a single-parent + commit that records the same tree as its parent, overriding the usual + safety valve. + + * "git commit --amend" can amend a merge that does not change the tree + from its first parent. + + * "git stash random-text" does not create a new stash anymore. It was + a UI mistake. Use "git stash save random-text", or "git stash" + (without extra args) for that. + + * "git prune --expire