[ANNOUNCE] GIT 1.5.0-rc4

[ANNOUNCE] GIT 1.5.0-rc4

[Junio C Hamano]

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 has already been pushed out?
      combine-diff: special case --unified=0
      show-branch -g: default to the current branch.
      git-clone --reference: saner handling of borrowed symrefs.
      Revert "Allow branch.*.merge to talk about remote tracking branches."
      Rename get_ident() to fmt_ident() and make it available to outside
      t9200: Work around HFS+ issues.
      bisect: it needs to be done in a working tree.
      git-blame: no rev means start from the working tree file.
      Add pretend_sha1_file() interface.
      Use pretend_sha1_file() in git-blame and git-merge-recursive.
      blame: document --contents option
      Teach git-remote add to fetch and track
      Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
      gitk: Use show-ref instead of ls-remote
      git-push: allow globbing wildcard refspec.
      gitweb: fix mismatched parenthesis
      annotate: fix for cvsserver.
      S_IFLNK != 0140000
      Remove contrib/colordiff
      Add deprecation notices.
      Remove git-merge-recur
      git-clone --reference: work well with pack-ref'ed reference repository
      for-each-reflog: fix case for empty log directory
      t4200: skip gc-rerere test on systems with non GNU date.
      git-add -i: update removed path correctly.
      Documentation: Add gfi to the main command list.
      GIT v1.5.0-rc4

Linus Torvalds (2):
      pager: Work around window resizing bug in 'less'
      Fix "git log -z" behaviour

Mark Levedahl (2):
      gitk - remove trailing whitespace from a few lines.
      Make gitk work reasonably well on Cygwin.

Michael (1):
      Documentation: add KMail in SubmittingPatches

Mike Coleman (1):
      Fix some documentation typos and grammar

Nicolas Pitre (14):
      make reflog filename independent from struct ref_lock
      lock_ref_sha1_basic(): remember the original name of a ref when resolving it
      enable separate reflog for HEAD
      add reflog entries for HEAD when detached
      move create_symref() past log_ref_write()
      add logref support to git-symbolic-ref
      add reflog when moving HEAD to a new branch
      reword the detached head message a little again
      add a quiet option to git-checkout
      prevent HEAD reflog to be interpreted as current branch reflog
      provide a nice @{...} syntax to always mean the current branch reflog
      scan reflogs independently from refs
      Enable HEAD@{...} and make it independent from the current branch
      Let git-checkout always drop any detached head

Pavel Roskin (2):
      git-config --rename-section could rename wrong section
      Assorted typo fixes

Robin Rosenberg (1):
      Why is it bad to rewind a branch that has already been pushed out?

Shawn O. Pearce (113):
      Created fast-import, a tool to quickly generating a pack from blobs.
      Added automatic index generation to fast-import.
      Cleaned up memory allocation for object_entry structs.
      Refactored fast-import's internals for future additions.
      Added basic command handler to fast-import.
      Implemented branch handling and basic tree support in fast-import.
      Added tree and commit writing to fast-import.
      Implement blob ID validation in fast-import.
      Converted fast-import to a text based protocol.
      Changed fast-import's pack header creation to use pack.h
      Allow symlink blobs in trees during fast-import.
      Fixed segfault in fast-import after growing a tree.
      Converted fast-import to accept standard command line parameters.
      Added mark store/find to fast-import.
      Added branch load counter to fast-import.
      Implemented 'tag' command in fast-import.
      Implemented tree reloading in fast-import.
      Round out memory pool allocations in fast-import to pointer sizes.
      Remove branch creation command from fast-import.
      Moved from command to after data to help cvs2svn.
      Account for tree entry memory costs in fast-import.
      Added option to export the marks table when fast-import terminates.
      Added --branch-log to option to fast-import.
      Fixed GPF in fast-import caused by unterminated linked list.
      Fixed compile error in fast-import.
      Map only part of the generated pack file at any point in time.
      Added 'reset' command to clear a branch's tree.
      Don't crash fast-import if no branch log was requested.
      Converted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.
      Implemented tree delta compression in fast-import.
      Recycle data buffers for tree generation in fast-import.
      Reuse the same buffer for all commits/tags in fast-import.
      Replace ywrite in fast-import with the standard write_or_die.
      Correct tree corruption problems in fast-import.
      Additional fast-import tree delta corruption cleanups.
      Fix repository corruption when using marks for modified blobs.
      Support creation of merge commits in fast-import.
      Allow creating branches without committing in fast-import.
      Improve reuse of sha1_file library within fast-import.
      Misc. type cleanups within fast-import.
      Restructure fast-import to support creating multiple packfiles.
      Remove unnecessary duplicate_count in fast-import.
      Implemented manual packfile switching in fast-import.
      Don't create a final empty packfile in fast-import.
      Optimize index creation on large object sets in fast-import.
      Implemented automatic checkpoints within fast-import.
      Print the packfile names to stdout from fast-import.
      Corrected buffer overflow during automatic checkpoint in fast-import.
      Use uintmax_t for marks in fast-import.
      Replace redundant yread() with read_in_full() in fast-import.
      Reuse sha1 in packed_git in fast-import.
      Use .keep files in fast-import during processing.
      Ensure we close the packfile after creating it in fast-import.
      Remove unnecessary pack_fd global in fast-import.
      Correct max_packsize default in fast-import.
      Correct object_count type and stat output in fast-import.
      Print out the edge commits for each packfile in fast-import.
      Corrected BNF input documentation for fast-import.
      Correct a few types to be unsigned in fast-import.
      Declare no-arg functions as (void) in fast-import.
      Correct packfile edge output in fast-import.
      Always use struct pack_header for pack header in fast-import.
      Use fixed-size integers when writing out the index in fast-import.
      Remove unnecessary options from fast-import.
      Support delimited data regions in fast-import.
      Create test case for fast-import.
      Reduce value duplication in t9300-fast-import.
      Accept 'inline' file data in fast-import commit structure.
      Pull out remote listing functions in git-remote.
      Teach 'git remote' how to cleanup stale tracking branches.
      Cleanup prepare_packed_git_one to reuse install_packed_git.
      Correct comment in prepare_packed_git_one.
      Refactor open_packed_git to return an error code.
      Don't find objects in packs which aren't available anymore.
      Don't leak file descriptors from unavailable pack files.
      Cleanup subcommand documentation for git-remote.
      Keep untracked files not involved in a merge.
      Default GIT_MERGE_VERBOSITY to 5 during tests.
      bash: Remove short option completions for branch/checkout/diff.
      bash: Classify cat-file and reflog as plumbing.
      bash: Complete long options to git-add.
      bash: Add space after unique command name is completed.
      bash: Classify more commends out of completion.
      bash: Support unique completion on git-config.
      bash: Support unique completion when possible.
      bash: Support internal revlist options better.
      Include checkpoint command in the BNF.
      Reduce memory usage of fast-import.
      Show an example of deleting commits with git-rebase.
      bash: Support completion on git-cherry.
      bash: Hide diff-stages from completion.
      bash: Offer --prune completion for git-gc.
      bash: Hide git-resolve, its deprecated.
      bash: Support --add completion to git-config.
      bash: Support git-bisect and its subcommands.
      Don't support shell-quoted refnames in fast-import.
      Initial draft of fast-import documentation.
      bash: Support git-rebase -m continuation completion.
      bash: Complete git-remote subcommands.
      Remove --branch-log from fast-import.
      Correct compiler warnings in fast-import.
      Correct minor style issue in fast-import.
      Correct fast-import timezone documentation.
      Remove unnecessary null pointer checks in fast-import.
      Minor fast-import documentation corrections.
      Support RFC 2822 date parsing in fast-import.
      Don't do non-fastforward updates in fast-import.
      Minor timestamp related documentation corrections for fast-import.
      Teach fast-import how to clear the internal branch content.
      Teach fast-import how to sit quietly in the corner.
      Dump all refs and marks during a checkpoint in fast-import.
      Don't crash fast-import if the marks cannot be exported.
      Add a Tips and Tricks section to fast-import's manual.

Simon 'corecode' Schubert (1):
      Allow forcing of a parent commit, even if the parent is not a direct one.

Stelian Pop (1):
      Add hg-to-git conversion utility.

Uwe Kleine-König (1):
      add replay and log to the usage string of git-bisect

Yasushi SHOJI (1):
      gitweb: Convert project name to UTF-8

Re: [ANNOUNCE] GIT 1.5.0-rc4

[Johannes Schindelin]

Hi,

On Wed, 7 Feb 2007, Junio C Hamano wrote:

> Michael (1):

This is hardly a unique identifier. We could as well write "anonymous" or 
"Beavis" instead.

Ciao,
Dscho

What's in git.git (stable)

[Junio C Hamano]

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 documentation.
  Add RPM target for git-gui

 Linus Torvalds (1):
  git reflog show

 Mark Levedahl (2):
  Make gitk save and restore the user set window position.
  Make gitk save and restore window pane position on Linux and Cygwin.

 Matthias Lederhofer (1):
  git merge documentation: -m is optional

 Michael Loeffler (1):
  import-tars: brown paper bag fix for file mode.

 Michael S. Tsirkin (3):
  Update git-log and git-show documentation
  add -C[NUM] to git-am
  Document that git-am can read standard input.

 Mukund (1):
  Fixed some typos in git-repack docs

 Nicolas Pitre (1):
  remove mailmap.linux

 René Scharfe (1):
  Avoid ugly linewrap in git help

 Shawn O. Pearce (313):
  git-gui: Initial revision.
  git-gui: Additional early feature development.
  git-gui: Fixed UI layout problems on Windows.
  git-gui: Corrected keyboard bindings on Windows, improved state management.
  git-gui: Verify we should actually perform a commit when asked to do so.
  git-gui: Finished commit implementation.
  git-gui: Implemented amended commits.
  git-gui: Misc. nit type of bug fixes.
  git-gui: Started construction of fetch and push operations.
  git-gui: Worked around environment variable problems on Windows.
  git-gui: Reorganized startup procedure to ensure gitdir is right.
  git-gui: Fix menu item accelerator display on Mac OS X.
  git-gui: Correctly handle CR vs. LF within the console of fetch.
  git-gui: Check for fetch or push command failure and denote it.
  git-gui: Don't complain if no .git/remotes exist.
  git-gui: Added current TODO list.
  git-gui: Last minute idea about fetch shortcuts.
  git-gui: Automatically reopen any console closed by the user.
  git-gui: Cache all repo-config data in an array.
  git-gui: Added support for pulling from default branch of a remote.
  git-gui: Updated TODO list now that pull is starting to work.
  git-gui: Corrected diff-index/diff-files protocol parsing errors.
  git-gui: Performance improvements for large file sets.
  git-gui: More performance improvements to rescan logic.
  git-gui: Flip commit message buffer and diff area.
  git-gui: Added repack database menu option, to invoke git repack.
  git-gui: Allow the user to disable update-index --refresh during rescan.
  git-gui: Grab the index lock while running pull.
  git-gui: Pluralize timestamps within the options menu.
  git-gui: Disable pull menu items when the index is locked.
  git-gui: Don't let the user pull into an uncommitted working directory.
  git-gui: Update TODO list.
  git-gui: Bug fix for bad variable reference in display_file.
  git-gui: Changed term 'check-in' to 'include'.
  git-gui: Show only the abbreviated SHA1 after committing.
  git-gui: Cache the GIT_COMMITTER_IDENT value on first sign-off.
  git-gui: Save window geometry to .git/config during exit.
  git-gui: Change accelerator for "Include All" to M1-I.
  git-gui: Created edit menu and basic editing bindings.
  git-gui: Clear undo/redo stack when loading a message file from disk.
  git-gui: Updated TODO list now that geometry is stored.
  git-gui: Always indicate the file in the diff viewer.
  git-gui: Correctly handle files containing LF in their name.
  git-gui: Efficiently update the UI after committing.
  git-gui: Use catch rather than array names to check file.
  git-gui: Rename difffont/mainfont variables.
  git-gui: Use native tk_messageBox for errors.
  git-gui: Cleaned up error message formatting.
  git-gui: Simplified format of geometry configuration.
  git-gui: Misc. formatting cleanups.
  git-gui: Misc. bug fixes for mouse click crashes.
  git-gui: Added context menus for consoles and commit message buffer.
  git-gui: Fix mouse cursor behavior when in widgets.
  git-gui: Teach sign off to be more intelligent.
  git-gui: Corrected font used for options menu items.
  git-gui: Honor system font and let user configure fonts.
  git-gui: Allow the user to change the diff viewer font size.
  git-gui: Refresh a file if it has an empty diff.
  git-gui: Make use of the Tk font system rather than faking it.
  git-gui: Improve right click context menu binding on all platforms.
  git-gui: Rename quitting global to is_quitting.
  git-gui: Use arrow cursor rather than left_ptr.
  git-gui: Refactor options menu into an options dialog.
  git-gui: Allow the user to manipulate the fonts from the options panel.
  git-gui: Supply progress feedback when running update-index.
  git-gui: Minor options dialog UI cleanups.
  git-gui: Added Options... menu item to end of diff context menu.
  git-gui: Use 'after 1' to post UI rather than tkwait.
  git-gui: Correct bugs in font config handling.
  git-gui: Hide non-commit related commands when invoked as git-citool.
  git-gui: Don't load the global options unless necessary.
  git-gui: Allow the user to disable diff stat summary during pull.
  git-gui: Run the pre-commit hook in the background.
  git-gui: Remove the commit_active global variable.
  git-gui: Added post-commit invocation after the commit is done.
  git-gui: Always use eq/ne for string comparsions.
  git-gui: Reshow diff if we sent the file to update-index.
  git-gui: Cleanup diff construction code to prepare for more options.
  git-gui: Allow the user to control the number of context lines in a diff.
  git-gui: Sort the list of paths being updated in the index.
  git-gui: Use a smaller pipe buffer for update-index.
  git-gui: Allow the user to copy name of the file in the diff viewer.
  git-gui: Correct language for M_/A_ status codes.
  git-gui: Display status on left in diff header.
  git-gui: Minor UI layout improvements for console windows.
  git-gui: Reverted file name text field to a label.
  git-gui: By default don't allow partially included files.
  git-gui: Refactor mouse clicking on file names/icons.
  git-gui: Narrow the no differences information message.
  git-gui: Implemented multiple selection in file lists.
  git-gui: Refactor update_status -> rescan.
  git-gui: Provide an after-rescan script to rescan.
  git-gui: Allow update_index to also run a script when it completes.
  git-gui: Automatically update-index all included files before commit.
  git-gui: Disable diff actions when no diff is active.
  git-gui: Created makefile to install the program.
  git-gui: Correctly handle GIT_DIR environment variable.
  git-gui: Create Windows shortcut icons for git-gui.
  git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
  git-gui: Handle ' within paths when creating Windows shortcuts.
  git-gui: Only populate a fetch or push if we have an action.
  git-gui: Create a .app file on MacOS X if requested.
  git-gui: Display error dialog on Mac OS X when no .git found.
  git-gui: Make initial commits work properly.
  git-gui: Only reshow diff when really necessary.
  git-gui: Refactor file state representations.
  git-gui: Add menu option to include only selected files.
  git-gui: Misc. comment formatting cleanups.
  git-gui: Start UI with the index locked.
  git-gui: Remove completed items from TODO list.
  git-gui: Toggle between new commit and amend commit modes.
  git-gui: Verify the user has GIT_COMMITTER_IDENT before comitting.
  git-gui: Rephrase rescan before commit informational message.
  git-gui: Allow adding untracked files in selection.
  git-gui: Don't create PkgInfo on Mac OS X "desktop icons".
  git-gui: Teach the gui how to uninclude a file.
  git-gui: Make consecutive icon clicks toggle included status of a file.
  git-gui: Correct toggling of deleted file status.
  git-gui: Fix list loading corruption introduced by 1461c5f3.
  git-gui: Describe deleted symlinks in a more friendly way.
  git-gui: Correct toggling of added/untracked status for new files.
  git-gui: Updated TODO list now that a task is complete.
  git-gui: Refactored diff line display formatting logic.
  git-gui: Restore the all important shebang line.
  git-gui: Update in memory states after commit.
  git-gui: Correct some state matchings for include/remove.
  git-gui: Improve handling of merge commits.
  git-gui: Allow users to run fsck-objects from the gui.
  git-gui: Don't save amended commit message buffer.
  git-gui: Reworded verify console title.
  git-gui: Seperate out the database operations in project menu.
  git-gui: Rename Project menu to Repository.
  git-gui: Added about dialog box.
  git-gui: Be more Macintosh like.
  git-gui: Make the copyright notice serve double duty.
  git-gui: Include the Tcl/Tk version in the about dialog.
  git-gui: Abstract out windows platform test to is_Windows proc.
  git-gui: Correct is_MacOSX platform test.
  git-gui: Warn Cygwin users about possible environment issues.
  git-gui: Added configuration editor TODO list.
  git-gui: Refactor M1 binding selection.
  git-gui: Added menu command to visualize all branches.
  git-gui: Don't start 'gitk --all' on Mac OS X.
  git-gui: Improve pull error dialogs.
  git-gui: Added revert changes command.
  git-gui: Display the current branch.
  git-gui: Support file state MD (modified/deleted).
  git-gui: Created Branch menu.
  git-gui: Parse off refs/remotes when showing current branch.
  git-gui: Abort on not implemented branch switching.
  git-gui: Automatically skip tracking branches in branch menu.
  git-gui: Rename all_branches -> all_heads.
  git-gui: Misc. comment and formatting cleanups.
  git-gui: Started implementation of switch_branch.
  git-gui: Set a proper title on our revert confirm dialog box.
  git-gui: Updated todo list.
  git-gui: Enable resolution of merge conflicts.
  git-gui: Auto-update any A? or M? files during rescan.
  git-gui: Reworded 'Include' to 'Add' to match core Git.
  git-gui: Created very crude Tools menu, to support miga.
  git-gui: Show all fetched branches for remote pulls.
  git-gui: Run git-gc rather than git-repack.
  git-gui: Corrected behavior of deleted (but existing in HEAD) files.
  git-gui: Correct wording of the revert confirmation dialog.
  git-gui: Work around odd cygpath bug on Windows.
  git-gui: Change more 'include' language to 'add'.
  git-gui: Hide the ugly bash command line from the windows desktop icon.
  git-gui: Modified makefile to embed version into git-gui script.
  git-gui: Display the git-gui version in the Help->About dialog.
  git-gui: Display the full GPL copyright notice in about dialog.
  git-gui: Ensure version number is always current.
  git-gui: Allow the user to copy the version data to the clipboard.
  git-gui: Don't offer my miga hack if its configuration file isn't present.
  git-gui: Suggest when running 'git gc' may be worthwhile.
  git-gui: Refactor reponame computation.
  git-gui: Cleanup usage of gitdir global variable.
  git-gui: Allow [gitdir ...] to act as [file join [gitdir] ...].
  git-gui: Make the gitk starting message match our usual format.
  git-gui: Display the directory we are entering during startup.
  git-gui: Start file status display refactoring.
  git-gui: Convert UI to use 'staged for commit' interface.
  git-gui: Correct DD file state to be only D_.
  git-gui: Remove invalid DM state.
  git-gui: Cleanup state descriptions.
  git-gui: Refactor add/remove proc names to align with reality.
  git-gui: Add or unstage based on the specific icon used.
  git-gui: Refactor the revert (aka checkout-index) implementation.
  git-gui: Refactor the add to commit state filters.
  git-gui: Simplify printing of index info to update-index.
  git-gui: Only permit selection in one list at a time.
  git-gui: Pad the cancel/save buttons in the options window.
  git-gui: Implemented create branch GUI.
  git-gui: Bind M1-N to create branch.
  git-gui: Implemented local branch deletion.
  git-gui: Allow users to delete branches merged upstream.
  git-gui: Allow creating branches from tracking heads.
  git-gui: Use borders on text fields in branch dialog.
  git-gui: Remove 'Allow Partially Added Files' option.
  git-gui: Move commit_prehook into commit_tree.
  git-gui: Improve the branch delete confirmation dialogs.
  git-gui: Don't delete the test target branch.
  git-gui: Attempt to checkout the new branch after creation.
  git-gui: Refactor current_diff -> current_diff_path.
  git-gui: Remove combined diff showing behavior.
  git-gui: Improve the display of merge conflicts.
  git-gui: Improve diff --cc viewing for unmerged files.
  git-gui: Fix bug in unmerged file display.
  git-gui: Clear diff from viewer if the side changed.
  git-gui: Correct disappearing unstaged files.
  git-gui: Add Refresh to diff viewer context menu.
  git-gui: Correct unmerged file detection at commit time.
  git-gui: Pad new branch name input box.
  git-gui: Use a grid layout for branch dialog.
  git-gui: Improve the merge check interface for branch deletion.
  git-gui: Change rude error popup to info popup.
  git-gui: Correctly ignore '* Unmerged path' during diff.
  git-gui: Make diff viewer colors match gitk's defaults.
  git-gui: Never line wrap in file lists.
  git-gui: Don't offer tracking branches if none exist.
  git-gui: Give a better error message on an empty branch name.
  git-gui: Allow user to specify a branch name pattern.
  git-gui: Improve keyboard traversal in dialogs.
  git-gui: Fully select a field when entering into it.
  git-gui: Automatically toggle the relevant radio buttons.
  git-gui: Correctly categorize tracking branches and heads.
  git-gui: Update todo list with finished and new items.
  git-gui: Slightly tweak new window geometry.
  git-gui: Create missing branch head on initial commit.
  git-gui: Don't format the mode line of a diff.
  git-gui: Force an update-index --refresh on unchanged files.
  git-gui: Don't attempt to tag new file/deleted file headers in diffs.
  git-gui: Fix 'Select All' action on Windows.
  git-gui: Ignore 'No newline at end of file' marker line.
  git-gui: Always start a rescan on an empty diff.
  git-gui: Don't show content of untracked binary files.
  git-gui: Limit display of large untracked files.
  git-gui: When possible show the type of an untracked file.
  git-gui: Don't try to tag the 'Binary files * and * differ' line.
  git-gui: Remove spurious newline in untracked file display.
  git-gui: Honor system encoding for filenames.
  git-gui: Handle commit encoding better.
  git-gui: Display database stats (count-objects -v) on demand.
  git-gui: Implement basic branch switching through read-tree.
  git-gui: Use system default labelframe bordering.
  git-gui: Display the size of the pack directory.
  git-gui: Only allow Refresh in diff context menu when we have a diff.
  git-gui: Allow staging/unstaging individual diff hunks.
  git-gui: Elide CRs appearing in diff output from display.
  git-gui: Cleanup end-of-line whitespace in commit messages.
  git-gui: Unset unnecessary UI setup variable.
  git-gui: Force focus to the diff viewer on mouse click.
  git-gui: Support 'Visualize All Branches' on Mac OS X.
  git-gui: Pad the database statistics dialog window.
  git-gui: Prefer Tk's entry widget over a 1 line text field.
  git-gui: Remove Pull menu and cleanup Branch/Fetch/Push menus.
  git-gui: Don't switch branches if changing to the current branch.
  git-gui: Maintain the same file list for diff during refresh.
  git-gui: Always use lsearch -exact, to prevent globbing.
  git-gui: Added arbitrary branch pushing support.
  git-gui: Remove no longer used pull from remote code.
  git-gui: Always use -v option to push.
  git-gui: Refactor console success/failure handling.
  git-gui: Use builtin version of 'git gc'.
  git-gui: Implement local merge operations.
  git-gui: Let users abort with `reset --hard` type logic.
  git-gui: Update status bar during a merge.
  git-gui: Don't allow users to commit a bad octopus merge.
  git-gui: Don't allow merges in the middle of other things.
  git-gui: Always offer scrollbars for branch lists.
  git-gui: Support merge.summary, merge.verbosity.
  git-gui: Reword meaning of merge.summary.
  git-gui: Offer quick access to the HTML formatted documentation.
  git-gui: Test for Cygwin differently than from Windows.
  git-gui: Implemented file browser and incremental blame.
  git-gui: Improve the icons used in the browser display.
  git-gui: Display the current branch name in browsers.
  git-gui: Allow users to edit user.name, user.email from options.
  git-gui: Use -M and -C when running blame.
  git-gui: Correctly handle spaces in filepaths.
  git-gui: Display original filename and line number in blame.
  git-gui: Install column headers in blame viewer.
  git-gui: Use a grid layout for the blame viewer.
  git-gui: Assign background colors to each blame hunk.
  Correct ^0 asciidoc syntax in fast-import docs.
  Correct some language in fast-import documentation.
  Correct spelling of fast-import in docs.
  tar archive frontend for fast-import.
  git-gui: Update known branches during rescan.
  git-gui: Support keyboard traversal in browser.
  git-gui: Replace \ with \\ when showing paths.
  git-gui: Refactor single_commit to a proc.
  git-gui: Separate transport/branch menus from multicommit.
  git-gui: Optionally save commit buffer on exit.
  git-gui: View blame from the command line.
  git-gui: Select subcommands like git does.
  git-gui: Relabel the Add All action.
  git-gui: Use git-config now over git-repo-config.
  git-gui: Redesign the display of annotated files.
  git-gui: Jump to the first annotation block as soon as its available.
  git-gui: Improve annotated file display.
  git-gui: Focus into blame panels on Mac OS.
  git-gui: Stop deleting gitk preferences.
  fast-import: Hide the pack boundary commits by default.
  fast-import: Add tip about importing renames.
  bash: Hide git-fast-import.
  fast-import: Support reusing 'from' and brown paper bag fix reset.
  git-gui: Allow gitexecdir, INSTALL to be set by the caller.
  git-gui: Rename GIT_VERSION to GITGUI_VERSION.
  git-gui: Generate a version file on demand.
  git-gui: Handle gitgui tags in version gen.
  git-gui: Guess our version accurately as a subproject.
  git-gui: Change base version to 0.6.
  Link git-gui into the master Makefile.

 Theodore Ts'o (2):
  Print a sane error message if an alias expands to an invalid git command
  Allow aliases to expand to shell commands

Re: What's in git.git (stable)

[Johannes Schindelin]

Hi,

On Mon, 12 Feb 2007, Junio C Hamano wrote:

> It feels like it took me forever to get here, but this is almost
> it.

Congratulations!

> The short-log looks huge but only because Shawn's git-gui is now 
> included.

So, it's a huge-log?

> Unless there is some last minute showstopper, the final will be
> cut on Wednesday.  Should I give it a catchy codename?  ;-)

Oh yes, yes, yes! (To both.)

Ciao,
Dscho

P.S.: How about "The frotzy Nitfol"?

Re: What's in git.git (stable)

[Matthias Lederhofer]

Junio C Hamano <junkio@cox.net> wrote:
> Unless there is some last minute showstopper, the final will be
> cut on Wednesday.  Should I give it a catchy codename?  ;-)
Documentation/git-checkout.txt still needs an update about reflogs
with detached HEAD (the paragraph starting with "The command would
refuse [..]").

Re: What's in git.git (stable)

[Bill Lear]

On Monday, February 12, 2007 at 21:15:41 (-0800) Junio C Hamano writes:
>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?  ;-)

How about "Wodin"?


Bill

Re: What's in git.git (stable)

[Bill Lear]

On Tuesday, February 13, 2007 at 08:33:22 (-0600) Bill Lear writes:
>On Monday, February 12, 2007 at 21:15:41 (-0800) Junio C Hamano writes:
>>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?  ;-)
>
>How about "Wodin"?

Actually, I think "Wotan" is it...


Bill

Re: What's in git.git (stable)

[Junio C Hamano]

Matthias Lederhofer <matled@gmx.net> writes:

> Junio C Hamano <junkio@cox.net> wrote:
>> Unless there is some last minute showstopper, the final will be
>> cut on Wednesday.  Should I give it a catchy codename?  ;-)
> 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

Re: What's in git.git (stable)

[Randal L. Schwartz]

>>>>> "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!

Re: What's in git.git (stable)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>> Unless there is some last minute showstopper, the final will be
>> cut on Wednesday.  Should I give it a catchy codename?  ;-)
>
> 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.

Re: What's in git.git (stable)

[Randal L. Schwartz]

>>>>> "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!

Re: What's in git.git (stable)

[Johannes Schindelin]

Hi,

On Tue, 13 Feb 2007, Randal L. Schwartz wrote:

> >>>>> "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"? :)

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

Re: What's in git.git (stable)

[Jimmy Tang]

Hi All,

On Tue, Feb 13, 2007 at 07:37:03PM +0100, Johannes Schindelin wrote:
> 
> <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>
> 

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

Re: What's in git.git (stable)

[Linus Torvalds]

On Tue, 13 Feb 2007, Jimmy Tang wrote:
> 
> 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 :)

I think that's a great naming convention for releases!

		Linus