The latest and hopefully the last rc for GIT 1.5.0 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.0.rc4.tar.{gz,bz2} (tarball) git-htmldocs-1.5.0.rc4.tar.{gz,bz2} (preformatted docs) git-manpages-1.5.0.rc4.tar.{gz,bz2} (preformatted docs) testing/git-*-1.5.0.rc4-1.$arch.rpm (RPM) Late comers are independent reflog for HEAD, git-blame that annotates the working tree files (and "--contents <file>"), and git-fast-import. ---------------------------------------------------------------- Changes since v1.5.0-rc3 are as follows: Alex Riesen (1): Avoid ActiveState Perl IO in t800[12] Andy Parkins (2): doc: hooks.txt said post-commit default sends an email, it doesn't git-for-each-ref doesn't return "the bit after $GIT_DIR/refs" Aneesh Kumar K.V (1): blameview: Support browsable functionality to blameview. David Kågedal (1): git-blame: an Emacs minor mode to view file with git-blame output. Eric Wong (2): git-svn: do not let Git.pm warn if we prematurely close pipes Disallow invalid --pretty= abbreviations Gerrit Pape (1): git-archimport: initial import needs empty directory Horst H. von Brand (1): Call make always with CFLAGS in git.spec Johannes Schindelin (4): Teach the '@{...}' notation to git-log -g Update the documentation for the new '@{...}' syntax Commands requiring a work tree must not run in GIT_DIR fast-import: Fix compile warnings Junio C Hamano (36): create_symref(): do not assume pathname from git_path() persists long enough detached HEAD -- finishing touches Use "git checkout -q" in git-bisect Tutorial: fix asciidoc formatting of "git add" section. Tutorial-2: Adjust git-status output to recent reality. core-tutorial: http reference link fix fix reflog entries for "git-branch" honor GIT_REFLOG_ACTION in git-commit Why is it bad to rewind a branch that ...
Hi, This is hardly a unique identifier. We could as well write "anonymous" or "Beavis" instead. Ciao, Dscho -
It feels like it took me forever to get here, but this is almost it. The short-log looks huge but only because Shawn's git-gui is now included. Unless there is some last minute showstopper, the final will be cut on Wednesday. Should I give it a catchy codename? ;-) * The 'master' branch has these since v1.5.0-rc4 Alexandre Julliard (3): diff.c: Reuse the pprint_rename function for diff --summary output. diff.c: Properly quote file names in diff --summary output. diff.c: More logical file name quoting for renames in diffstat. Aneesh Kumar K.V (1): blameview: Move the commit info to a pane below the blame window. David Kågedal (5): Handle uncommitted changes and cache descriptions git-blame.el: improve color handling git-blame.el: blame unsaved changes git-blame.el: Doc fixes and cleanup git-blame.el: Autoupdate while editing Dotan Barak (1): Make it easier to override path to asciidoc command Eric Wong (1): git-svn: correctly handle boolean options via git-config Jakub Narebski (2): git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate git-blame: Change installation instructions James Bowes (1): Read cvsimport options from repo-config Johannes Schindelin (4): for_each_reflog_ent: be forgiving about missing message log --reflog: honour --relative-date format-patch -n: make sorting easier by padding number log --reflog: use dwim_log Junio C Hamano (11): create_symref(): create leading directories as needed. reflog: handle $name => remotes/%s/HEAD mapping consistently for logs Documentation/git-pull: describe default behaviour and config interactions git-fetch: document automatic tag following. wt_status_prepare(): clean up structure initialization. diff_flush_name(): take struct diff_options parameter. t4016: test quoting funny pathnames in diff output Documentation: git-rebase -C<n> Teach git-am to pass -p option down to git-apply Add discussion section to git-tag ...
Hi, Oh yes, yes, yes! (To both.) Ciao, Dscho P.S.: How about "The frotzy Nitfol"? -
I am starting to regret asking that question. I initially had something related to Feb 14th in mind when I sent the message, but realized it is not as universal as I thought after reading an Wikipedia article. -
>>>>> "Junio" == Junio C Hamano <junkio@cox.net> writes: Junio> I am starting to regret asking that question. I initially had Junio> something related to Feb 14th in mind when I sent the message, Junio> but realized it is not as universal as I thought after reading Junio> an Wikipedia article. The "would have been Randal's Parents' 46th wedding anniversary had they not divorced 28 years ago" release? :) And I was born exactly nine months later. Amazing. Not only that, my brother was born the same day a year later. Can anyone say "wedding night and first anniversary"? :) -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 <merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/> Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training! -
Hi, Okay, okay, I already had one shot, but here's another: <silly> Let's call it "American PI minus one" release. Since Americans love to fsck up the dates, they would write the month first, then the day, which ends up being 2.14, which is exactly PI - 1 rounded to three digits! Alternatively, since they really write 2/14, we could call it the "one seventh" release... </silly> Enough already, Dscho -
Hi All, in a totally different direction... how about code naming the release(s) with british slang words? since ``git'' is a fairly common british slang word (also used quite abit in ireland too) to describe an unlikeable person. and since the release is going to be cut on the 14th, how about calling it the "snog" release :) not too sure how appropriate it would be to name releases after british slang words as they usually have inappropriate meanings. Jimmy -- Jimmy Tang Trinity Centre for High Performance Computing, Lloyd Building, Trinity College Dublin, Dublin 2, Ireland. http://www.tchpc.tcd.ie/ | http://www.tchpc.tcd.ie/~jtang -
I think that's a great naming convention for releases! Linus -
Documentation/git-checkout.txt still needs an update about reflogs with detached HEAD (the paragraph starting with "The command would refuse [..]"). -
Thanks. I'd do the following. --- diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 55c9289..e4ffde4 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -103,22 +103,12 @@ by any branch (which is natural --- you are not on any branch). What this means is that you can discard your temporary commits and merges by switching back to an existing branch (e.g. `git checkout master`), and a later `git prune` or `git gc` would -garbage-collect them. - -The command would refuse to switch back to make sure that you do -not discard your temporary state by mistake when your detached -HEAD is not pointed at by any existing ref. If you did want to -save your state (e.g. "I was interested in the fifth commit from -the top of 'master' branch", or "I made two commits to fix minor -bugs while on a detached HEAD" -- and if you do not want to lose -these facts), you can create a new branch and switch to it with -`git checkout -b newbranch` so that you can keep building on -that state, or tag it first so that you can come back to it -later and switch to the branch you wanted to switch to with `git -tag that_state; git checkout master`. On the other hand, if you -did want to discard the temporary state, you can give `-f` -option (e.g. `git checkout -f master`) to override this -behaviour. +garbage-collect them. If you did this by mistake, you can ask +the reflog for HEAD where you were, e.g. + +------------ +$ git log -g -2 HEAD +------------ EXAMPLES -
>>>>> "Bill" == Bill Lear <rael@zopyra.com> writes: Bill> Actually, I think "Wotan" is it... Wotan Clang? (Sideways reference to Wu-Tang Clan "music" group.) -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 <merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/> Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training! -
