{"thread":{"id":"25940","subject":"path/to/some/file: needs update","startedAt":"2010-12-03T18:34:24Z","lastAt":"2010-12-07T15:23:14Z","messageCount":9,"participants":["Patrick Doyle","Jonathan Nieder","Matthieu Moy","Neal Kreitzinger","Ben Walton","Drew Northup"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"157231","messageId":"AANLkTinsUZCUJamUHWN=H7tyL5nKACmEcyvG6hpsTDtv@mail.gmail.com","threadId":"25940","inReplyTo":null,"subject":"path/to/some/file: needs update","fromName":"Patrick Doyle","fromEmail":"wpdster@gmail.com","sentAt":"2010-12-03T18:34:24Z","receivedAt":"2010-12-03T18:34:24Z","isPatch":false,"sender":{"key":"wpdster@gmail.com","avatar":null},"body":"Would it make sense to change the \"needs update\" message to read\n\"locally modified\"?\n\nI walked out of the office yesterday afternoon little knowing that the\ntwo folks left there, who are both VCS neophytes in general, were\nabout to enter what they described as \"version control H#@@\".\n\nIt all started when one of them tried to pull the latest version of\nour repository from the server.  He was quite startled by all of the\nmessages that read\n\npath/to/some/file: needs update.\n\nThen things got worse... one of the messages said:\n\nerror: Entry 'path/to/some/binaryfile' not uptodate.  Cannot merge\n\n\"Huh?!?!\", they exclaimed to each other.  \"I wasn't doing a merge.  I\nwas doing a pull.  Well, I guess that's kinda like a merge.  But why\ndid it generate an error?  Shouldn't it have generated a conflict\nmessage?\".  At least, I'm imagining that's what they said to each\nother.  I wasn't there.  I just got the phone call an hour later when\nI was on the train going home.\n\nNeedless to say, I was able to calm them down.  But it occurred to me\nthat \"needs update\" isn't necessarily the most helpful message and\nthat \"error: ... Cannot merge\" could offer a little more explanation.\n\nI'm happy to submit the trivial patch changing \"needs update\" to\n\"locally modified\".  I suspect there might be some ramifications in\nterms of scripts that expect the old message to be there, but\nhopefully not.\n\nWhat do folks think?\n\n--wpd\n"},{"id":"157233","messageId":"20101203185250.GA14049@burratino","threadId":"25940","inReplyTo":"AANLkTinsUZCUJamUHWN=H7tyL5nKACmEcyvG6hpsTDtv@mail.gmail.com","subject":"Re: path/to/some/file: needs update","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-12-03T18:52:51Z","receivedAt":"2010-12-03T18:52:51Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nPatrick Doyle wrote:\n\n> Needless to say, I was able to calm them down.  But it occurred to me\n> that \"needs update\" isn't necessarily the most helpful message and\n> that \"error: ... Cannot merge\" could offer a little more explanation.\n>\n> I'm happy to submit the trivial patch changing \"needs update\" to\n> \"locally modified\".  I suspect there might be some ramifications in\n> terms of scripts that expect the old message to be there\n[...]\n> What do folks think?\n\nI think you are quite right, on both counts.\n\nSee v1.6.0-rc0~4 (\"needs update\" considered harmful, 2008-07-20) and\nv1.5.6-rc0~7^2 (unpack-trees: allow Porcelain to give different error\nmessages, 2008-05-17) for inspiration.  Do you remember which\nporcelain command was making trouble in this example?\n"},{"id":"157234","messageId":"vpqk4jq3cpc.fsf@bauges.imag.fr","threadId":"25940","inReplyTo":"AANLkTinsUZCUJamUHWN=H7tyL5nKACmEcyvG6hpsTDtv@mail.gmail.com","subject":"Re: path/to/some/file: needs update","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-12-03T18:58:55Z","receivedAt":"2010-12-03T18:58:55Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Patrick Doyle <wpdster@gmail.com> writes:\n\n> path/to/some/file: needs update.\n>\n> Then things got worse... one of the messages said:\n>\n> error: Entry 'path/to/some/binaryfile' not uptodate.  Cannot merge\n\nWhich commands triggered these messages? Which version of Git?\n\nAFAICT, these messages never appear anymore in normal (porcelain) use\nin recent Gits.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"157376","messageId":"AANLkTinFHFzjLNb5PpoH8WG_3gHpo4LaZaUOYX-=PFYN@mail.gmail.com","threadId":"25940","inReplyTo":"vpqk4jq3cpc.fsf@bauges.imag.fr","subject":"Re: path/to/some/file: needs update","fromName":"Patrick Doyle","fromEmail":"wpdster@gmail.com","sentAt":"2010-12-06T00:44:32Z","receivedAt":"2010-12-06T00:44:32Z","isPatch":false,"sender":{"key":"wpdster@gmail.com","avatar":null},"body":"On Fri, Dec 3, 2010 at 1:58 PM, Matthieu Moy\n<Matthieu.Moy@grenoble-inp.fr> wrote:\n> Patrick Doyle <wpdster@gmail.com> writes:\n>\n>> path/to/some/file: needs update.\n>>\n>> Then things got worse... one of the messages said:\n>>\n>> error: Entry 'path/to/some/binaryfile' not uptodate.  Cannot merge\n>\n> Which commands triggered these messages? Which version of Git?\n>\n> AFAICT, these messages never appear anymore in normal (porcelain) use\n> in recent Gits.\nAhhh... that's something.\n\nI just checked.  The box they  were using is an RHEL 5 box that has\n1.5.5.6 installed on it.  Perhaps it's time to upgrade their git.\nI'll go see what repo I need to add to RHEL to get a more recent git.\n\nThanks.\n\n--wpd\n"},{"id":"157422","messageId":"idjc9t$6hv$1@dough.gmane.org","threadId":"25940","inReplyTo":"AANLkTinFHFzjLNb5PpoH8WG_3gHpo4LaZaUOYX-=PFYN@mail.gmail.com","subject":"Re: path/to/some/file: needs update","fromName":"Neal Kreitzinger","fromEmail":"neal@rsss.com","sentAt":"2010-12-06T19:06:27Z","receivedAt":"2010-12-06T19:06:27Z","isPatch":false,"sender":{"key":"neal@rsss.com","avatar":null},"body":">\"Patrick Doyle\" <wpdster@gmail.com> wrote in message \n>news:AANLkTinFHFzjLNb5PpoH8WG_3gHpo4LaZaUOYX->=PFYN@mail.gmail.com...\n>On Fri, Dec 3, 2010 at 1:58 PM, Matthieu Moy\n><Matthieu.Moy@grenoble-inp.fr> wrote:\n>> Patrick Doyle <wpdster@gmail.com> writes:\n>>\n>>> path/to/some/file: needs update.\n>>>\n>>> Then things got worse... one of the messages said:\n>>>\n>>> error: Entry 'path/to/some/binaryfile' not uptodate. Cannot merge\n>>\n>> Which commands triggered these messages? Which version of Git?\n>>\n>> AFAICT, these messages never appear anymore in normal (porcelain) use\n>> in recent Gits.\n>Ahhh... that's something.\n>\n>I just checked.  The box they  were using is an RHEL 5 box that has\n>1.5.5.6 installed on it.  Perhaps it's time to upgrade their git.\n>I'll go see what repo I need to add to RHEL to get a more recent git.\n>\n>Thanks.\n>\n>--wpd\n\nHi, Patrick,\n\nThere isn't an RHEL or EPEL rpm for a current version of git.  What you'll \nneed to do is build git yourself using the tarball download from git.  The \nmake file provided by git has worked great for me.  Here are my instructions \non how I did it.  They are written for a linux newbie (me) and I've used \nthem for several git installs/upgrades and my linux-illiterate coworker has \nsuccessfully used them too (with me looking over his shoulder).  Because \nI've used it for several installs, some different git version numbers are in \nthe detailed notes.  I've left them there for precision.  However, in my \nexperience the steps were the same for these differnt git versions, so you \ncan pretend they are for whatever git version you end up chosing to install. \nWe have dozens of git repos in production being used for productional \ndevelopment, and several servers with git installed, so hopefully these \ninstructions should work for you too:\n\n\"How to install git on Red Hat, RHEL\"\nNOTE:  This only includes what is needed to get command line git, gitk, and \ngit gui working.  It does NOT include the extra stuff needed to get gitweb, \nor git documentation (manpages, html, etc) working.\n\nGIT INSTALL, PART 1.  INSTALL GIT.\nCompile Git manually because Red Hat's Git version is obsolete.\n\n1.  Choose a git version.\n1.1  Review the git release notes: \nhttp://www.kernel.org/pub/software/scm/git/docs/  The last minor revision of \nmajor release is the usually the safest because many bugfixes have been \nmade.  A version that has a corresponding git manual release number is also \npreferable.  Usually the last revision of a major release also has a \ncorresponding git manual release - this is ideal.\n2.  Download git sourcecode.\n2.1  Use the git0 login for the source download:   (note:  'git0' is \nwhatever login you have allocated as the 'git admin' signon.)\n[git0]$ cd /home/git0\n2.2  Create a specific folder for the git source:\n[git0]$ mkdir git-source\n[git0]$ cd /home/git0/git-source\n2.3  Review the git source tar files located on: \nhttp://www.kernel.org/pub/software/scm/git/  and locate the tar for your \nchosen version.\n2.4  Copy and paste the url into the wget command, and then copy and paste \n(append) the tar filename to the end of the wget command:\n[git0]$ wget http://kernel.org/pub/software/scm/git/git-1.6.3.4.tar.gz \nwhere 1.6.3.4 is your chosen git version.\n2.5  Untar the git sourcecode:\n[git0]$ tar xzf git-1.6.3.4.tar.gz  (where 1.6.3.4 is whatever git version \nyou chose to install.)\n[git0]$ cd git-1.6.3.4  (the tar command created this directory for you.)\n[git0]$ ls -la  (verify the contents.)\n3.  Research Git Dependencies.  Validate prerequisite packages and install \nif necessary.\n3.1  Read INSTALL file of git source release to obtain the current list of \nprerequisite packages.  The development version of these packages is \nrequired or preferred in order to perform a compile of git.  Development \npackages have the same name but are suffixed with \"-devel\", e.g.  zlib-devel \ninstead of zlib.  The regular non-devel version of the package IS STILL \nREQUIRED, e.g. zlib-devel AND zlib.\n3.1.1  [git0]$ cat /home/git0/git-source/git-1.6.3.4/INSTALL\n4.  Resolve Git Dependencies.\nValidate prerequisite packages and install if necessary.  The following is \nthe dependency list from the git-1.6.3.4 INSTALL file:\nREMINDER:\nREAD YOUR INSTALL FILE FROM GIT.  DO NOT RELY SOLELY ON THIS IN-HOUSE \nDOCUMENT.\n4.1  \"zlib\", the compression library. Git won't build without it.\n4.1.1  [neal]$ yum list zlib\n4.1.2  [neal]$ yum list zlib-devel\n4.2  \"openssl\".  Unless you specify otherwise, you'll get the SHA1 library \nfrom here.  If you don't have openssl, you can use one of the SHA1 libraries \nthat come with git (git includes the one from Mozilla, and has its own \nPowerPC and ARM optimized ones too - see the Makefile).\n4.2.1  [neal]$ yum list openssl\n4.2.2  [neal]$ yum list openssl-devel\n4.3  libcurl library; git-http-fetch and git-fetch use them.  You might also \nwant the \"curl\" executable for debugging purposes. If you do not use http \ntransfer, you are probably OK if you do not have them.\nNOTE: I installed security updates, 'yum update --security' to remediate \nout-of-date curl packages.\nNOTE:  to get yum security plugin:\n$ yum install yum-security.  (allows security updates only.)\n4.3.1  [neal]$ yum list curl  (Red Hat calls it curl instead of libcurl.)\n4.3.2  [neal]$ yum list curl-devel  (Red Hat calls it curl-devel instead of \nlibcurl-devel.)\n4.4  expat library; git-http-push uses it for remote lock management over \nDAV.  Similar to \"curl\" above, this is optional.\n4.4.1  [neal]$ yum list expat\n4.4.2  [neal]$ yum list expat-devel\n4.5  \"wish\", the Tcl/Tk windowing shell is used in gitk to show the history \ngraphically, and in git-gui.\n4.5.1  [neal]$ yum list tcl\n4.5.2  [neal]$ yum list tcl-devel\n4.5.3  [neal]$ yum list tk\n4.5.4  [neal]$ yum list tk-devel\n4.5.5  [neal]$ yum list xdg-utils  (development version \"-devel\" is not \nneeded for xdg-utils.)\n4.6  \"ssh\" is used to push and pull over the net.\n4.6.1  There is no package to validate.  In Red Hat this is part of the OS.\n4.7  \"perl\" and POSIX-compliant shells are needed to use most of the \nbare-bones Porcelainish scripts.\n4.7.1  [neal]$ yum list perl  (Perl is a programming language.  There is no \n\"-devel\" version required.)\n5.  Compile Git.\n5.1  Perform the Git installation process from the \n/home/git0/git-source/git-1.6.3.4 directory:\n[neal]$ cd /home/git0/git-source/git-1.6.3.4\n5.2  READ THE \"Makefile\" LOCATED IN THE /home/git0/git-source/git-1.6.3.4 \nDIRECTORY.  Review the compiler options and instructions in the comments at \nthe beginning of the file.  DO NOT RELY SOLELY ON THIS RSSS IN-HOUSE \nDOCUMENT.\n5.3  [neal]$ make prefix=/usr all  The compiler options defaults should be \nok.  Review the Makefile instructions to review the options.\n5.4  Review output for errors.  Copy and paste the results into a file for \nlater reference.\n5.4  SAMPLE of GOOD OUTPUT for 1.7.1 install:\n[git0@rsssDev git-1.7.1]$ make prefix=/usr all\nGIT_VERSION = 1.7.1\n    * new build flags or prefix\n    CC fast-import.o\n    CC abspath.o\n    CC advice.o\n    CC alias.o\n    CC alloc.o\n    CC archive.o\n    CC archive-tar.o\n    CC archive-zip.o\n    CC attr.o\n    CC base85.o\n    CC bisect.o\n    CC blob.o\n    CC branch.o\n    CC bundle.o\n    CC cache-tree.o\n    CC color.o\n    CC combine-diff.o\n    CC commit.o\n    CC config.o\n    CC connect.o\n    CC convert.o\n    CC copy.o\n    CC csum-file.o\n    CC ctype.o\n    CC date.o\n    CC decorate.o\n    CC diffcore-break.o\n    CC diffcore-delta.o\n    CC diffcore-order.o\n    CC diffcore-pickaxe.o\n    CC diffcore-rename.o\n    CC diff-delta.o\n    CC diff-lib.o\n    CC diff-no-index.o\n    CC diff.o\n    CC dir.o\n    CC editor.o\n    CC entry.o\n    CC environment.o\n    CC exec_cmd.o\n    CC fsck.o\n    CC graph.o\n    CC grep.o\n    CC hash.o\n    CC help.o\n    CC hex.o\n    CC ident.o\n    CC levenshtein.o\n    CC list-objects.o\n    CC ll-merge.o\n    CC lockfile.o\n    CC log-tree.o\n    CC mailmap.o\n    CC match-trees.o\n    CC merge-file.o\n    CC merge-recursive.o\n    CC name-hash.o\n    CC notes.o\n    CC object.o\n    CC pack-check.o\n    CC pack-refs.o\n    CC pack-revindex.o\n    CC pack-write.o\n    CC pager.o\n    CC parse-options.o\n    CC patch-delta.o\n    CC patch-ids.o\n    CC path.o\n    CC pkt-line.o\n    CC preload-index.o\n    CC pretty.o\n    CC progress.o\n    CC quote.o\n    CC reachable.o\n    CC read-cache.o\n    CC reflog-walk.o\n    CC refs.o\n    CC remote.o\n    CC replace_object.o\n    CC rerere.o\n    CC resolve-undo.o\n    CC revision.o\n    CC run-command.o\n    CC server-info.o\n    CC setup.o\n    CC sha1-lookup.o\n    CC sha1_file.o\n    CC sha1_name.o\n    CC shallow.o\n    CC sideband.o\n    CC sigchain.o\n    CC strbuf.o\n    CC string-list.o\n    CC submodule.o\n    CC symlinks.o\n    CC tag.o\n    CC trace.o\n    CC transport.o\n    CC transport-helper.o\n    CC tree-diff.o\n    CC tree.o\n    CC tree-walk.o\n    CC unpack-trees.o\n    CC usage.o\n    CC userdiff.o\n    CC utf8.o\n    CC walker.o\n    CC wrapper.o\n    CC write_or_die.o\n    CC ws.o\n    CC wt-status.o\n    CC xdiff-interface.o\n    CC thread-utils.o\n    CC compat/strlcpy.o\n    AR libgit.a\n    CC xdiff/xdiffi.o\n    CC xdiff/xprepare.o\n    CC xdiff/xutils.o\n    CC xdiff/xemit.o\n    CC xdiff/xmerge.o\n    CC xdiff/xpatience.o\n    AR xdiff/lib.a\n    LINK git-fast-import\n    CC imap-send.o\n    LINK git-imap-send\n    CC shell.o\n    LINK git-shell\n    CC show-index.o\n    LINK git-show-index\n    CC upload-pack.o\n    LINK git-upload-pack\n    CC http-backend.o\n    LINK git-http-backend\n    CC http.o\n    CC http-walker.o\n    CC http-fetch.o\n    LINK git-http-fetch\n    CC http-push.o\n    LINK git-http-push\n    CC daemon.o\n    LINK git-daemon\n    CC remote-curl.o\n    LINK git-remote-http\n    LN/CP git-remote-https\n    LN/CP git-remote-ftp\n    LN/CP git-remote-ftps\n    GEN git-am\n    GEN git-bisect\n    GEN git-difftool--helper\n    GEN git-filter-branch\n    GEN git-lost-found\n    GEN git-merge-octopus\n    GEN git-merge-one-file\n    GEN git-merge-resolve\n    GEN git-mergetool\n    GEN git-pull\n    GEN git-quiltimport\n    GEN git-rebase--interactive\n    GEN git-rebase\n    GEN git-repack\n    GEN git-request-pull\n    GEN git-stash\n    GEN git-submodule\n    GEN git-web--browse\n    SUBDIR perl\n/usr/bin/perl Makefile.PL PREFIX='/usr'\nWriting perl.mak for Git\n    GEN git-add--interactive\n    GEN git-difftool\n    GEN git-archimport\n    GEN git-cvsexportcommit\n    GEN git-cvsimport\n    GEN git-cvsserver\n    GEN git-relink\n    GEN git-send-email\n    GEN git-svn\n    SUBDIR gitweb\n    SUBDIR ../\nmake[2]: `GIT-VERSION-FILE' is up to date.\n    GEN gitweb.cgi\n    GEN git-instaweb\n    GEN git-mergetool--lib\n    GEN git-parse-remote\n    GEN git-sh-setup\n    GEN common-cmds.h\n    CC git.o\n    CC builtin/add.o\n    CC builtin/annotate.o\n    CC builtin/apply.o\n    CC builtin/archive.o\n    CC builtin/bisect--helper.o\n    CC builtin/blame.o\n    CC builtin/branch.o\n    CC builtin/bundle.o\n    CC builtin/cat-file.o\n    CC builtin/check-attr.o\n    CC builtin/check-ref-format.o\n    CC builtin/checkout-index.o\n    CC builtin/checkout.o\n    CC builtin/clean.o\n    CC builtin/clone.o\n    CC builtin/commit-tree.o\n    CC builtin/commit.o\n    CC builtin/config.o\n    CC builtin/count-objects.o\n    CC builtin/describe.o\n    CC builtin/diff-files.o\n    CC builtin/diff-index.o\n    CC builtin/diff-tree.o\n    CC builtin/diff.o\n    CC builtin/fast-export.o\n    CC builtin/fetch-pack.o\n    CC builtin/fetch.o\n    CC builtin/fmt-merge-msg.o\n    CC builtin/for-each-ref.o\n    CC builtin/fsck.o\n    CC builtin/gc.o\n    CC builtin/grep.o\n    CC builtin/hash-object.o\n    CC builtin/help.o\n    CC builtin/index-pack.o\n    CC builtin/init-db.o\n    CC builtin/log.o\n    CC builtin/ls-files.o\n    CC builtin/ls-remote.o\n    CC builtin/ls-tree.o\n    CC builtin/mailinfo.o\n    CC builtin/mailsplit.o\n    CC builtin/merge.o\n    CC builtin/merge-base.o\n    CC builtin/merge-file.o\n    CC builtin/merge-index.o\n    CC builtin/merge-ours.o\n    CC builtin/merge-recursive.o\n    CC builtin/merge-tree.o\n    CC builtin/mktag.o\n    CC builtin/mktree.o\n    CC builtin/mv.o\n    CC builtin/name-rev.o\n    CC builtin/notes.o\n    CC builtin/pack-objects.o\n    CC builtin/pack-redundant.o\n    CC builtin/pack-refs.o\n    CC builtin/patch-id.o\n    CC builtin/prune-packed.o\n    CC builtin/prune.o\n    CC builtin/push.o\n    CC builtin/read-tree.o\n    CC builtin/receive-pack.o\n    CC builtin/reflog.o\n    CC builtin/remote.o\n    CC builtin/replace.o\n    CC builtin/rerere.o\n    CC builtin/reset.o\n    CC builtin/rev-list.o\n    CC builtin/rev-parse.o\n    CC builtin/revert.o\n    CC builtin/rm.o\n    CC builtin/send-pack.o\n    CC builtin/shortlog.o\n    CC builtin/show-branch.o\n    CC builtin/show-ref.o\n    CC builtin/stripspace.o\n    CC builtin/symbolic-ref.o\n    CC builtin/tag.o\n    CC builtin/tar-tree.o\n    CC builtin/unpack-file.o\n    CC builtin/unpack-objects.o\n    CC builtin/update-index.o\n    CC builtin/update-ref.o\n    CC builtin/update-server-info.o\n    CC builtin/upload-archive.o\n    CC builtin/var.o\n    CC builtin/verify-pack.o\n    CC builtin/verify-tag.o\n    CC builtin/write-tree.o\n    LINK git\n    BUILTIN git-add\n    BUILTIN git-annotate\n    BUILTIN git-apply\n    BUILTIN git-archive\n    BUILTIN git-bisect--helper\n    BUILTIN git-blame\n    BUILTIN git-branch\n    BUILTIN git-bundle\n    BUILTIN git-cat-file\n    BUILTIN git-check-attr\n    BUILTIN git-check-ref-format\n    BUILTIN git-checkout-index\n    BUILTIN git-checkout\n    BUILTIN git-clean\n    BUILTIN git-clone\n    BUILTIN git-commit-tree\n    BUILTIN git-commit\n    BUILTIN git-config\n    BUILTIN git-count-objects\n    BUILTIN git-describe\n    BUILTIN git-diff-files\n    BUILTIN git-diff-index\n    BUILTIN git-diff-tree\n    BUILTIN git-diff\n    BUILTIN git-fast-export\n    BUILTIN git-fetch-pack\n    BUILTIN git-fetch\n    BUILTIN git-fmt-merge-msg\n    BUILTIN git-for-each-ref\n    BUILTIN git-fsck\n    BUILTIN git-gc\n    BUILTIN git-grep\n    BUILTIN git-hash-object\n    BUILTIN git-help\n    BUILTIN git-index-pack\n    BUILTIN git-init-db\n    BUILTIN git-log\n    BUILTIN git-ls-files\n    BUILTIN git-ls-remote\n    BUILTIN git-ls-tree\n    BUILTIN git-mailinfo\n    BUILTIN git-mailsplit\n    BUILTIN git-merge\n    BUILTIN git-merge-base\n    BUILTIN git-merge-file\n    BUILTIN git-merge-index\n    BUILTIN git-merge-ours\n    BUILTIN git-merge-recursive\n    BUILTIN git-merge-tree\n    BUILTIN git-mktag\n    BUILTIN git-mktree\n    BUILTIN git-mv\n    BUILTIN git-name-rev\n    BUILTIN git-notes\n    BUILTIN git-pack-objects\n    BUILTIN git-pack-redundant\n    BUILTIN git-pack-refs\n    BUILTIN git-patch-id\n    BUILTIN git-prune-packed\n    BUILTIN git-prune\n    BUILTIN git-push\n    BUILTIN git-read-tree\n    BUILTIN git-receive-pack\n    BUILTIN git-reflog\n    BUILTIN git-remote\n    BUILTIN git-replace\n    BUILTIN git-rerere\n    BUILTIN git-reset\n    BUILTIN git-rev-list\n    BUILTIN git-rev-parse\n    BUILTIN git-revert\n    BUILTIN git-rm\n    BUILTIN git-send-pack\n    BUILTIN git-shortlog\n    BUILTIN git-show-branch\n    BUILTIN git-show-ref\n    BUILTIN git-stripspace\n    BUILTIN git-symbolic-ref\n    BUILTIN git-tag\n    BUILTIN git-tar-tree\n    BUILTIN git-unpack-file\n    BUILTIN git-unpack-objects\n    BUILTIN git-update-index\n    BUILTIN git-update-ref\n    BUILTIN git-update-server-info\n    BUILTIN git-upload-archive\n    BUILTIN git-var\n    BUILTIN git-verify-pack\n    BUILTIN git-verify-tag\n    BUILTIN git-write-tree\n    BUILTIN git-cherry\n    BUILTIN git-cherry-pick\n    BUILTIN git-format-patch\n    BUILTIN git-fsck-objects\n    BUILTIN git-get-tar-commit-id\n    BUILTIN git-init\n    BUILTIN git-merge-subtree\n    BUILTIN git-peek-remote\n    BUILTIN git-repo-config\n    BUILTIN git-show\n    BUILTIN git-stage\n    BUILTIN git-status\n    BUILTIN git-whatchanged\n    SUBDIR git-gui\nGITGUI_VERSION = 0.12.0.64.g89d6\n    * new locations or Tcl/Tk interpreter\n    GEN git-gui\n    INDEX lib/\n    MSGFMT    po/de.msg 520 translated.\n    MSGFMT    po/el.msg 381 translated, 4 fuzzy, 6 untranslated.\n    MSGFMT    po/fr.msg 520 translated.\n    MSGFMT    po/hu.msg 514 translated.\n    MSGFMT    po/it.msg 519 translated, 1 untranslated.\n    MSGFMT    po/ja.msg 520 translated.\n    MSGFMT    po/nb.msg 474 translated, 39 untranslated.\n    MSGFMT    po/ru.msg 513 translated, 2 untranslated.\n    MSGFMT    po/sv.msg 520 translated.\n    MSGFMT po/zh_cn.msg 366 translated, 7 fuzzy, 17 untranslated.\n    SUBDIR gitk-git\n    GEN gitk-wish\nGenerating catalog po/de.msg\nmsgfmt --statistics --tcl po/de.po -l de -d po/\n289 translated messages.\nGenerating catalog po/es.msg\nmsgfmt --statistics --tcl po/es.po -l es -d po/\n200 translated messages, 7 untranslated messages.\nGenerating catalog po/fr.msg\nmsgfmt --statistics --tcl po/fr.po -l fr -d po/\n276 translated messages, 4 fuzzy translations.\nGenerating catalog po/hu.msg\nmsgfmt --statistics --tcl po/hu.po -l hu -d po/\n288 translated messages.\nGenerating catalog po/it.msg\nmsgfmt --statistics --tcl po/it.po -l it -d po/\n283 translated messages, 6 untranslated messages.\nGenerating catalog po/ja.msg\nmsgfmt --statistics --tcl po/ja.po -l ja -d po/\n284 translated messages.\nGenerating catalog po/ru.msg\nmsgfmt --statistics --tcl po/ru.po -l ru -d po/\n245 translated messages.\nGenerating catalog po/sv.msg\nmsgfmt --statistics --tcl po/sv.po -l sv -d po/\n289 translated messages.\n    SUBDIR perl\ncp Git.pm blib/lib/Git.pm\nManifying blib/man3/Git.3pm\n    SUBDIR git_remote_helpers\n    SUBDIR templates\n    CC test-chmtime.o\n    LINK test-chmtime\n    CC test-ctype.o\n    LINK test-ctype\n    CC test-date.o\n    LINK test-date\n    CC test-delta.o\n    LINK test-delta\n    CC test-dump-cache-tree.o\n    LINK test-dump-cache-tree\n    CC test-genrandom.o\n    LINK test-genrandom\n    CC test-match-trees.o\n    LINK test-match-trees\n    CC test-parse-options.o\n    LINK test-parse-options\n    CC test-path-utils.o\n    LINK test-path-utils\n    CC test-run-command.o\n    LINK test-run-command\n    CC test-sha1.o\n    LINK test-sha1\n    CC test-sigchain.o\n    LINK test-sigchain\n    CC test-index-version.o\n    LINK test-index-version\n    GEN bin-wrappers/git\n    GEN bin-wrappers/git-upload-pack\n    GEN bin-wrappers/git-receive-pack\n    GEN bin-wrappers/git-upload-archive\n    GEN bin-wrappers/git-shell\n    GEN bin-wrappers/git-cvsserver\n    GEN bin-wrappers/test-chmtime\n    GEN bin-wrappers/test-ctype\n    GEN bin-wrappers/test-date\n    GEN bin-wrappers/test-delta\n    GEN bin-wrappers/test-dump-cache-tree\n    GEN bin-wrappers/test-genrandom\n    GEN bin-wrappers/test-match-trees\n    GEN bin-wrappers/test-parse-options\n    GEN bin-wrappers/test-path-utils\n    GEN bin-wrappers/test-run-command\n    GEN bin-wrappers/test-sha1\n    GEN bin-wrappers/test-sigchain\n    GEN bin-wrappers/test-index-version\n6.  Install Git.\n6.1  Login as root.\n6.2  [root]# cd /home/git0/git-source/git-1.6.3.4\n6.3  [root]# make prefix=/usr install\n6.3 SAMPLE of GOOD OUTPUT for 1.7.1 install:\n[root]# make prefix=/usr install\n    SUBDIR git-gui\n    SUBDIR gitk-git\nmake[1]: Nothing to be done for `all'.\n    SUBDIR perl\n    SUBDIR git_remote_helpers\n    SUBDIR templates\ninstall -d -m 755 '/usr/bin'\ninstall -d -m 755 '/usr/libexec/git-core'\ninstall   git-fast-import git-imap-send git-shell git-show-index \ngit-upload-pack\n git-http-backend git-http-fetch git-http-push git-daemon git-remote-http \ngit-re\nmote-https git-remote-ftp git-remote-ftps git-am git-bisect \ngit-difftool--helper\n git-filter-branch git-lost-found git-merge-octopus git-merge-one-file \ngit-merge\n-resolve git-mergetool git-pull git-quiltimport git-rebase--interactive \ngit-reba\nse git-repack git-request-pull git-stash git-submodule git-web--browse \ngit-add--\ninteractive git-difftool git-archimport git-cvsexportcommit git-cvsimport \ngit-cv\nsserver git-relink git-send-email git-svn  git-instaweb \n'/usr/libexec/git-core'\ninstall -m 644  git-mergetool--lib git-parse-remote git-sh-setup \n'/usr/libexec/g\nit-core'\ninstall git git-upload-pack git-receive-pack git-upload-archive git-shell \ngit-cv\nsserver '/usr/bin'\nmake -C templates DESTDIR='' install\nmake[1]: Entering directory `/home/git0/git-source/git-1.7.1/templates'\ninstall -d -m 755 '/usr/share/git-core/templates'\n(cd blt && tar cf - .) | \\\n        (cd '/usr/share/git-core/templates' && umask 022 && tar xof -)\nmake[1]: Leaving directory `/home/git0/git-source/git-1.7.1/templates'\nmake -C perl prefix='/usr' DESTDIR='' install\nmake[1]: Entering directory `/home/git0/git-source/git-1.7.1/perl'\nmake[2]: Entering directory `/home/git0/git-source/git-1.7.1/perl'\nInstalling /usr/lib/perl5/site_perl/5.8.8/Git.pm\nInstalling /usr/share/man/man3/Git.3pm\nWriting \n/usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/auto/Git/.pac\nklist\nAppending installation info to \n/usr/lib64/perl5/5.8.8/x86_64-linux-thread-multi/\nperllocal.pod\nmake[2]: Leaving directory `/home/git0/git-source/git-1.7.1/perl'\nmake[1]: Leaving directory `/home/git0/git-source/git-1.7.1/perl'\nmake -C git_remote_helpers prefix='/usr' DESTDIR='' install\nmake[1]: Entering directory \n`/home/git0/git-source/git-1.7.1/git_remote_helpers'\n\n/usr/bin/python setup.py install --prefix /usr\nrunning install\nrunning build\nrunning build_py\nrunning install_lib\ncopying build/lib/git_remote_helpers/git/git.py -> \n/usr/lib/python2.4/site-packa\nges/git_remote_helpers/git\ncopying build/lib/git_remote_helpers/git/__init__.py -> \n/usr/lib/python2.4/site-\npackages/git_remote_helpers/git\ncopying build/lib/git_remote_helpers/util.py -> \n/usr/lib/python2.4/site-packages\n/git_remote_helpers\ncopying build/lib/git_remote_helpers/__init__.py -> \n/usr/lib/python2.4/site-pack\nages/git_remote_helpers\nbyte-compiling \n/usr/lib/python2.4/site-packages/git_remote_helpers/git/git.py to\n git.pyc\nbyte-compiling \n/usr/lib/python2.4/site-packages/git_remote_helpers/git/__init__.\npy to __init__.pyc\nbyte-compiling /usr/lib/python2.4/site-packages/git_remote_helpers/util.py \nto ut\nil.pyc\nbyte-compiling \n/usr/lib/python2.4/site-packages/git_remote_helpers/__init__.py t\no __init__.pyc\nmake[1]: Leaving directory \n`/home/git0/git-source/git-1.7.1/git_remote_helpers'\nmake -C gitk-git install\nmake[1]: Entering directory `/home/git0/git-source/git-1.7.1/gitk-git'\ninstall -m 755 gitk-wish '/usr/bin'/gitk\ninstall -d -m 755 '/usr/share/gitk/lib/msgs'\ninstall -m 644 po/de.msg '/usr/share/gitk/lib/msgs' &&  install -m 644 \npo/es.msg\n '/usr/share/gitk/lib/msgs' &&  install -m 644 po/fr.msg \n'/usr/share/gitk/lib/ms\ngs' &&  install -m 644 po/hu.msg '/usr/share/gitk/lib/msgs' &&  install -m \n644 p\no/it.msg '/usr/share/gitk/lib/msgs' &&  install -m 644 po/ja.msg \n'/usr/share/git\nk/lib/msgs' &&  install -m 644 po/ru.msg '/usr/share/gitk/lib/msgs' && \ninstall\n-m 644 po/sv.msg '/usr/share/gitk/lib/msgs' && true\nmake[1]: Leaving directory `/home/git0/git-source/git-1.7.1/gitk-git'\nmake -C git-gui gitexecdir='/usr/libexec/git-core' install\nmake[1]: Entering directory `/home/git0/git-source/git-1.7.1/git-gui'\n  DEST /usr/libexec/git-core\n    INSTALL 755 git-gui\n    INSTALL 755 git-gui--askpass\n    LINK        git-citool -> git-gui\n  DEST /usr/share/git-gui/lib\n    INSTALL 644 tclIndex\n    INSTALL 644 about.tcl\n    INSTALL 644 blame.tcl\n    INSTALL 644 branch.tcl\n    INSTALL 644 branch_checkout.tcl\n    INSTALL 644 branch_create.tcl\n    INSTALL 644 branch_delete.tcl\n    INSTALL 644 branch_rename.tcl\n    INSTALL 644 browser.tcl\n    INSTALL 644 checkout_op.tcl\n    INSTALL 644 choose_font.tcl\n    INSTALL 644 choose_repository.tcl\n    INSTALL 644 choose_rev.tcl\n    INSTALL 644 class.tcl\n    INSTALL 644 commit.tcl\n    INSTALL 644 console.tcl\n    INSTALL 644 database.tcl\n    INSTALL 644 date.tcl\n    INSTALL 644 diff.tcl\n    INSTALL 644 encoding.tcl\n    INSTALL 644 error.tcl\n    INSTALL 644 index.tcl\n    INSTALL 644 logo.tcl\n    INSTALL 644 merge.tcl\n    INSTALL 644 mergetool.tcl\n    INSTALL 644 option.tcl\n    INSTALL 644 remote.tcl\n    INSTALL 644 remote_add.tcl\n    INSTALL 644 remote_branch_delete.tcl\n    INSTALL 644 search.tcl\n    INSTALL 644 shortcut.tcl\n    INSTALL 644 spellcheck.tcl\n    INSTALL 644 sshkey.tcl\n    INSTALL 644 status_bar.tcl\n    INSTALL 644 themed.tcl\n    INSTALL 644 tools.tcl\n    INSTALL 644 tools_dlg.tcl\n    INSTALL 644 transport.tcl\n    INSTALL 644 win32.tcl\n    INSTALL 644 git-gui.ico\n    INSTALL 644 win32_shortcut.js\n  DEST /usr/share/git-gui/lib/msgs\n    INSTALL 644 de.msg\n    INSTALL 644 el.msg\n    INSTALL 644 fr.msg\n    INSTALL 644 hu.msg\n    INSTALL 644 it.msg\n    INSTALL 644 ja.msg\n    INSTALL 644 nb.msg\n    INSTALL 644 ru.msg\n    INSTALL 644 sv.msg\n    INSTALL 644 zh_cn.msg\nmake[1]: Leaving directory `/home/git0/git-source/git-1.7.1/git-gui'\nbindir=$(cd '/usr/bin' && pwd) && \\\n        execdir=$(cd '/usr/libexec/git-core' && pwd) && \\\n        { test \"$bindir/\" = \"$execdir/\" || \\\n                { rm -f \"$execdir/git\" && \\\n                test -z \"\" && \\\n                ln \"$bindir/git\" \"$execdir/git\" 2>/dev/null || \\\n                cp \"$bindir/git\" \"$execdir/git\"; } ; } && \\\n        { for p in  git-add git-annotate git-apply git-archive \ngit-bisect--helpe\nr git-blame git-branch git-bundle git-cat-file git-check-attr \ngit-check-ref-form\nat git-checkout-index git-checkout git-clean git-clone git-commit-tree \ngit-commi\nt git-config git-count-objects git-describe git-diff-files git-diff-index \ngit-di\nff-tree git-diff git-fast-export git-fetch-pack git-fetch git-fmt-merge-msg \ngit-\nfor-each-ref git-fsck git-gc git-grep git-hash-object git-help \ngit-index-pack gi\nt-init-db git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo \ngit-mailsp\nlit git-merge git-merge-base git-merge-file git-merge-index git-merge-ours \ngit-m\nerge-recursive git-merge-tree git-mktag git-mktree git-mv git-name-rev \ngit-notes\n git-pack-objects git-pack-redundant git-pack-refs git-patch-id \ngit-prune-packed\n git-prune git-push git-read-tree git-receive-pack git-reflog git-remote \ngit-rep\nlace git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm \ngit-send-\npack git-shortlog git-show-branch git-show-ref git-stripspace \ngit-symbolic-ref g\nit-tag git-tar-tree git-unpack-file git-unpack-objects git-update-index \ngit-upda\nte-ref git-update-server-info git-upload-archive git-var git-verify-pack \ngit-ver\nify-tag git-write-tree git-cherry git-cherry-pick git-format-patch \ngit-fsck-obje\ncts git-get-tar-commit-id git-init git-merge-subtree git-peek-remote \ngit-repo-co\nnfig git-show git-stage git-status git-whatchanged; do \\\n                rm -f \"$execdir/$p\" && \\\n                ln \"$execdir/git\" \"$execdir/$p\" 2>/dev/null || \\\n                ln -s \"git\" \"$execdir/$p\" 2>/dev/null || \\\n                cp \"$execdir/git\" \"$execdir/$p\" || exit; \\\n          done; } && \\\n        { for p in git-remote-https git-remote-ftp git-remote-ftps; do \\\n                rm -f \"$execdir/$p\" && \\\n                ln \"$execdir/git-remote-http\" \"$execdir/$p\" 2>/dev/null || \\\n                ln -s \"git-remote-http\" \"$execdir/$p\" 2>/dev/null || \\\n                cp \"$execdir/git-remote-http\" \"$execdir/$p\" || exit; \\\n          done; } && \\\n        ./check_bindir \"z$bindir\" \"z$execdir\" \"$bindir/git-add\"\n[root]#\n7.  Validate Git.\n7.1  See what version of git is installed.\n[neal]$ git --version\n7.2  See where git is installed.\n[neal]$ git --exec-path\n7.3  VNC to gui desktop.\nOpen Terminal.\n[neal]$ gitk  validate that gitk executes and displays.\n[neal]$ git gui  validate that git gui executes and displays.\nNote:  Only after you have a local repository working tree can you can \nvalidate xdg-utils as follows:\n<Repository> -> <Browse Master's Files>  validate's xdg-utils.\n\n\nGIT INSTALL.  PART 2.  INSTALL GIT RELATED TOOLS.\n1.  Install KDiff3.  Merge tool.\n1.1  [root]# yum list kdiff3  (See if its already installed.)\n1.2  [root]# yum install kdiff3  (Install it if it is not already \ninstalled.)\n1.3  [root]# yum list kdiff3  (Verify that it is installed.)\n1.3  SAMPLE OUTPUT:\nkdiff3.x86_64                      0.9.92-14.el5 \ninstalled\n\n\nLike I said, this is what has worked for me.  Hope this helps!\n\n(If anyone has any *PROVEN* improvements and/or additions to my procedures \nthen by all means let me know...)\n\n\nv/r,\nNeal \n"},{"id":"157424","messageId":"idjd25$ajd$1@dough.gmane.org","threadId":"25940","inReplyTo":"idjc9t$6hv$1@dough.gmane.org","subject":"Re: path/to/some/file: needs update","fromName":"Neal Kreitzinger","fromEmail":"neal@rsss.com","sentAt":"2010-12-06T19:19:23Z","receivedAt":"2010-12-06T19:19:23Z","isPatch":false,"sender":{"key":"neal@rsss.com","avatar":null},"body":"\"Neal Kreitzinger\" <neal@rsss.com> wrote in message \nnews:idjc9t$6hv$1@dough.gmane.org...\n> >\"Patrick Doyle\" <wpdster@gmail.com> wrote in message \n> >news:AANLkTinFHFzjLNb5PpoH8WG_3gHpo4LaZaUOYX->=PFYN@mail.gmail.com...\n>>On Fri, Dec 3, 2010 at 1:58 PM, Matthieu Moy\n>><Matthieu.Moy@grenoble-inp.fr> wrote:\n>>> Patrick Doyle <wpdster@gmail.com> writes:\n>>>\n>>>> path/to/some/file: needs update.\n>>>>\n>>>> Then things got worse... one of the messages said:\n>>>>\n>>>> error: Entry 'path/to/some/binaryfile' not uptodate. Cannot merge\n>>>\n>>> Which commands triggered these messages? Which version of Git?\n>>>\n>>> AFAICT, these messages never appear anymore in normal (porcelain) use\n>>> in recent Gits.\n>>Ahhh... that's something.\n>>\n>>I just checked.  The box they  were using is an RHEL 5 box that has\n>>1.5.5.6 installed on it.  Perhaps it's time to upgrade their git.\n>>I'll go see what repo I need to add to RHEL to get a more recent git.\n>>\n>>Thanks.\n>>\n>>--wpd\n>\n> Hi, Patrick,\n>\n> There isn't an RHEL or EPEL rpm for a current version of git.  What you'll \n> need to do is build git yourself using the tarball download from git.  The \n> make file provided by git has worked great for me.  Here are my \n> instructions on how I did it.  They are written for a linux newbie (me) \n> and I've used them for several git installs/upgrades and my \n> linux-illiterate coworker has successfully used them too (with me looking \n> over his shoulder).  Because I've used it for several installs, some \n> different git version numbers are in the detailed notes.  I've left them \n> there for precision.  However, in my experience the steps were the same \n> for these differnt git versions, so you can pretend they are for whatever \n> git version you end up chosing to install. We have dozens of git repos in \n> production being used for productional development, and several servers \n> with git installed, so hopefully these instructions should work for you \n> too:\n>\n> \"How to install git on Red Hat, RHEL\"\n> NOTE:  This only includes what is needed to get command line git, gitk, \n> and git gui working.  It does NOT include the extra stuff needed to get \n> gitweb, or git documentation (manpages, html, etc) working.\n>\n> GIT INSTALL, PART 1.  INSTALL GIT.\n> Compile Git manually because Red Hat's Git version is obsolete.\n>\n> 1.  Choose a git version.\n> 1.1  Review the git release notes: \n> http://www.kernel.org/pub/software/scm/git/docs/  The last minor revision \n> of major release is the usually the safest because many bugfixes have been \n> made.  A version that has a corresponding git manual release number is \n> also preferable.  Usually the last revision of a major release also has a \n> corresponding git manual release - this is ideal.\n> 2.  Download git sourcecode.\n> 2.1  Use the git0 login for the source download:   (note:  'git0' is \n> whatever login you have allocated as the 'git admin' signon.)\n> [git0]$ cd /home/git0\n> 2.2  Create a specific folder for the git source:\n> [git0]$ mkdir git-source\n> [git0]$ cd /home/git0/git-source\n> 2.3  Review the git source tar files located on: \n> http://www.kernel.org/pub/software/scm/git/  and locate the tar for your \n> chosen version.\n> 2.4  Copy and paste the url into the wget command, and then copy and paste \n> (append) the tar filename to the end of the wget command:\n> [git0]$ wget http://kernel.org/pub/software/scm/git/git-1.6.3.4.tar.gz \n> where 1.6.3.4 is your chosen git version.\n> 2.5  Untar the git sourcecode:\n> [git0]$ tar xzf git-1.6.3.4.tar.gz  (where 1.6.3.4 is whatever git version \n> you chose to install.)\n> [git0]$ cd git-1.6.3.4  (the tar command created this directory for you.)\n> [git0]$ ls -la  (verify the contents.)\n> 3.  Research Git Dependencies.  Validate prerequisite packages and install \n> if necessary.\n> 3.1  Read INSTALL file of git source release to obtain the current list of \n> prerequisite packages.  The development version of these packages is \n> required or preferred in order to perform a compile of git.  Development \n> packages have the same name but are suffixed with \"-devel\", e.g. \n> zlib-devel instead of zlib.  The regular non-devel version of the package \n> IS STILL REQUIRED, e.g. zlib-devel AND zlib.\n> 3.1.1  [git0]$ cat /home/git0/git-source/git-1.6.3.4/INSTALL\n> 4.  Resolve Git Dependencies.\n> Validate prerequisite packages and install if necessary.  The following is \n> the dependency list from the git-1.6.3.4 INSTALL file:\n> REMINDER:\n> READ YOUR INSTALL FILE FROM GIT.  DO NOT RELY SOLELY ON THIS IN-HOUSE \n> DOCUMENT.\n> 4.1  \"zlib\", the compression library. Git won't build without it.\n> 4.1.1  [neal]$ yum list zlib\n> 4.1.2  [neal]$ yum list zlib-devel\n> 4.2  \"openssl\".  Unless you specify otherwise, you'll get the SHA1 library \n> from here.  If you don't have openssl, you can use one of the SHA1 \n> libraries that come with git (git includes the one from Mozilla, and has \n> its own PowerPC and ARM optimized ones too - see the Makefile).\n> 4.2.1  [neal]$ yum list openssl\n> 4.2.2  [neal]$ yum list openssl-devel\n> 4.3  libcurl library; git-http-fetch and git-fetch use them.  You might \n> also want the \"curl\" executable for debugging purposes. If you do not use \n> http transfer, you are probably OK if you do not have them.\n> NOTE: I installed security updates, 'yum update --security' to remediate \n> out-of-date curl packages.\n> NOTE:  to get yum security plugin:\n> $ yum install yum-security.  (allows security updates only.)\n> 4.3.1  [neal]$ yum list curl  (Red Hat calls it curl instead of libcurl.)\n> 4.3.2  [neal]$ yum list curl-devel  (Red Hat calls it curl-devel instead \n> of libcurl-devel.)\n> 4.4  expat library; git-http-push uses it for remote lock management over \n> DAV.  Similar to \"curl\" above, this is optional.\n> 4.4.1  [neal]$ yum list expat\n> 4.4.2  [neal]$ yum list expat-devel\n> 4.5  \"wish\", the Tcl/Tk windowing shell is used in gitk to show the \n> history graphically, and in git-gui.\n> 4.5.1  [neal]$ yum list tcl\n> 4.5.2  [neal]$ yum list tcl-devel\n> 4.5.3  [neal]$ yum list tk\n> 4.5.4  [neal]$ yum list tk-devel\n> 4.5.5  [neal]$ yum list xdg-utils  (development version \"-devel\" is not \n> needed for xdg-utils.)\n> 4.6  \"ssh\" is used to push and pull over the net.\n> 4.6.1  There is no package to validate.  In Red Hat this is part of the \n> OS.\n> 4.7  \"perl\" and POSIX-compliant shells are needed to use most of the \n> bare-bones Porcelainish scripts.\n> 4.7.1  [neal]$ yum list perl  (Perl is a programming language.  There is \n> no \"-devel\" version required.)\n> 5.  Compile Git.\n> 5.1  Perform the Git installation process from the \n> /home/git0/git-source/git-1.6.3.4 directory:\n> [neal]$ cd /home/git0/git-source/git-1.6.3.4\n> 5.2  READ THE \"Makefile\" LOCATED IN THE /home/git0/git-source/git-1.6.3.4 \n> DIRECTORY.  Review the compiler options and instructions in the comments \n> at the beginning of the file.  DO NOT RELY SOLELY ON THIS RSSS IN-HOUSE \n> DOCUMENT.\n> 5.3  [neal]$ make prefix=/usr all  The compiler options defaults should be \n> ok.  Review the Makefile instructions to review the options.\n> 5.4  Review output for errors.  Copy and paste the results into a file for \n> later reference.\n> 5.4  SAMPLE of GOOD OUTPUT for 1.7.1 install:\n> [git0@rsssDev git-1.7.1]$ make prefix=/usr all\n> GIT_VERSION = 1.7.1\n>    * new build flags or prefix\n>    CC fast-import.o\n>    CC abspath.o\n>    CC advice.o\n>    CC alias.o\n>    CC alloc.o\n>    CC archive.o\n>    CC archive-tar.o\n>    CC archive-zip.o\n>    CC attr.o\n>    CC base85.o\n>    CC bisect.o\n>    CC blob.o\n>    CC branch.o\n>    CC bundle.o\n>    CC cache-tree.o\n>    CC color.o\n>    CC combine-diff.o\n>    CC commit.o\n>    CC config.o\n>    CC connect.o\n>    CC convert.o\n>    CC copy.o\n>    CC csum-file.o\n>    CC ctype.o\n>    CC date.o\n>    CC decorate.o\n>    CC diffcore-break.o\n>    CC diffcore-delta.o\n>    CC diffcore-order.o\n>    CC diffcore-pickaxe.o\n>    CC diffcore-rename.o\n>    CC diff-delta.o\n>    CC diff-lib.o\n>    CC diff-no-index.o\n>    CC diff.o\n>    CC dir.o\n>    CC editor.o\n>    CC entry.o\n>    CC environment.o\n>    CC exec_cmd.o\n>    CC fsck.o\n>    CC graph.o\n>    CC grep.o\n>    CC hash.o\n>    CC help.o\n>    CC hex.o\n>    CC ident.o\n>    CC levenshtein.o\n>    CC list-objects.o\n>    CC ll-merge.o\n>    CC lockfile.o\n>    CC log-tree.o\n>    CC mailmap.o\n>    CC match-trees.o\n>    CC merge-file.o\n>    CC merge-recursive.o\n>    CC name-hash.o\n>    CC notes.o\n>    CC object.o\n>    CC pack-check.o\n>    CC pack-refs.o\n>    CC pack-revindex.o\n>    CC pack-write.o\n>    CC pager.o\n>    CC parse-options.o\n>    CC patch-delta.o\n>    CC patch-ids.o\n>    CC path.o\n>    CC pkt-line.o\n>    CC preload-index.o\n>    CC pretty.o\n>    CC progress.o\n>    CC quote.o\n>    CC reachable.o\n>    CC read-cache.o\n>    CC reflog-walk.o\n>    CC refs.o\n>    CC remote.o\n>    CC replace_object.o\n>    CC rerere.o\n>    CC resolve-undo.o\n>    CC revision.o\n>    CC run-command.o\n>    CC server-info.o\n>    CC setup.o\n>    CC sha1-lookup.o\n>    CC sha1_file.o\n>    CC sha1_name.o\n>    CC shallow.o\n>    CC sideband.o\n>    CC sigchain.o\n>    CC strbuf.o\n>    CC string-list.o\n>    CC submodule.o\n>    CC symlinks.o\n>    CC tag.o\n>    CC trace.o\n>    CC transport.o\n>    CC transport-helper.o\n>    CC tree-diff.o\n>    CC tree.o\n>    CC tree-walk.o\n>    CC unpack-trees.o\n>    CC usage.o\n>    CC userdiff.o\n>    CC utf8.o\n>    CC walker.o\n>    CC wrapper.o\n>    CC write_or_die.o\n>    CC ws.o\n>    CC wt-status.o\n>    CC xdiff-interface.o\n>    CC thread-utils.o\n>    CC compat/strlcpy.o\n>    AR libgit.a\n>    CC xdiff/xdiffi.o\n>    CC xdiff/xprepare.o\n>    CC xdiff/xutils.o\n>    CC xdiff/xemit.o\n>    CC xdiff/xmerge.o\n>    CC xdiff/xpatience.o\n>    AR xdiff/lib.a\n>    LINK git-fast-import\n>    CC imap-send.o\n>    LINK git-imap-send\n>    CC shell.o\n>    LINK git-shell\n>    CC show-index.o\n>    LINK git-show-index\n>    CC upload-pack.o\n>    LINK git-upload-pack\n>    CC http-backend.o\n>    LINK git-http-backend\n>    CC http.o\n>    CC http-walker.o\n>    CC http-fetch.o\n>    LINK git-http-fetch\n>    CC http-push.o\n>    LINK git-http-push\n>    CC daemon.o\n>    LINK git-daemon\n>    CC remote-curl.o\n>    LINK git-remote-http\n>    LN/CP git-remote-https\n>    LN/CP git-remote-ftp\n>    LN/CP git-remote-ftps\n>    GEN git-am\n>    GEN git-bisect\n>    GEN git-difftool--helper\n>    GEN git-filter-branch\n>    GEN git-lost-found\n>    GEN git-merge-octopus\n>    GEN git-merge-one-file\n>    GEN git-merge-resolve\n>    GEN git-mergetool\n>    GEN git-pull\n>    GEN git-quiltimport\n>    GEN git-rebase--interactive\n>    GEN git-rebase\n>    GEN git-repack\n>    GEN git-request-pull\n>    GEN git-stash\n>    GEN git-submodule\n>    GEN git-web--browse\n>    SUBDIR perl\n> /usr/bin/perl Makefile.PL PREFIX='/usr'\n> Writing perl.mak for Git\n>    GEN git-add--interactive\n>    GEN git-difftool\n>    GEN git-archimport\n>    GEN git-cvsexportcommit\n>    GEN git-cvsimport\n>    GEN git-cvsserver\n>    GEN git-relink\n>    GEN git-send-email\n>    GEN git-svn\n>    SUBDIR gitweb\n>    SUBDIR ../\n> make[2]: `GIT-VERSION-FILE' is up to date.\n>    GEN gitweb.cgi\n>    GEN git-instaweb\n>    GEN git-mergetool--lib\n>    GEN git-parse-remote\n>    GEN git-sh-setup\n>    GEN common-cmds.h\n>    CC git.o\n>    CC builtin/add.o\n>    CC builtin/annotate.o\n>    CC builtin/apply.o\n>    CC builtin/archive.o\n>    CC builtin/bisect--helper.o\n>    CC builtin/blame.o\n>    CC builtin/branch.o\n>    CC builtin/bundle.o\n>    CC builtin/cat-file.o\n>    CC builtin/check-attr.o\n>    CC builtin/check-ref-format.o\n>    CC builtin/checkout-index.o\n>    CC builtin/checkout.o\n>    CC builtin/clean.o\n>    CC builtin/clone.o\n>    CC builtin/commit-tree.o\n>    CC builtin/commit.o\n>    CC builtin/config.o\n>    CC builtin/count-objects.o\n>    CC builtin/describe.o\n>    CC builtin/diff-files.o\n>    CC builtin/diff-index.o\n>    CC builtin/diff-tree.o\n>    CC builtin/diff.o\n>    CC builtin/fast-export.o\n>    CC builtin/fetch-pack.o\n>    CC builtin/fetch.o\n>    CC builtin/fmt-merge-msg.o\n>    CC builtin/for-each-ref.o\n>    CC builtin/fsck.o\n>    CC builtin/gc.o\n>    CC builtin/grep.o\n>    CC builtin/hash-object.o\n>    CC builtin/help.o\n>    CC builtin/index-pack.o\n>    CC builtin/init-db.o\n>    CC builtin/log.o\n>    CC builtin/ls-files.o\n>    CC builtin/ls-remote.o\n>    CC builtin/ls-tree.o\n>    CC builtin/mailinfo.o\n>    CC builtin/mailsplit.o\n>    CC builtin/merge.o\n>    CC builtin/merge-base.o\n>    CC builtin/merge-file.o\n>    CC builtin/merge-index.o\n>    CC builtin/merge-ours.o\n>    CC builtin/merge-recursive.o\n>    CC builtin/merge-tree.o\n>    CC builtin/mktag.o\n>    CC builtin/mktree.o\n>    CC builtin/mv.o\n>    CC builtin/name-rev.o\n>    CC builtin/notes.o\n>    CC builtin/pack-objects.o\n>    CC builtin/pack-redundant.o\n>    CC builtin/pack-refs.o\n>    CC builtin/patch-id.o\n>    CC builtin/prune-packed.o\n>    CC builtin/prune.o\n>    CC builtin/push.o\n>    CC builtin/read-tree.o\n>    CC builtin/receive-pack.o\n>    CC builtin/reflog.o\n>    CC builtin/remote.o\n>    CC builtin/replace.o\n>    CC builtin/rerere.o\n>    CC builtin/reset.o\n>    CC builtin/rev-list.o\n>    CC builtin/rev-parse.o\n>    CC builtin/revert.o\n>    CC builtin/rm.o\n>    CC builtin/send-pack.o\n>    CC builtin/shortlog.o\n>    CC builtin/show-branch.o\n>    CC builtin/show-ref.o\n>    CC builtin/stripspace.o\n>    CC builtin/symbolic-ref.o\n>    CC builtin/tag.o\n>    CC builtin/tar-tree.o\n>    CC builtin/unpack-file.o\n>    CC builtin/unpack-objects.o\n>    CC builtin/update-index.o\n>    CC builtin/update-ref.o\n>    CC builtin/update-server-info.o\n>    CC builtin/upload-archive.o\n>    CC builtin/var.o\n>    CC builtin/verify-pack.o\n>    CC builtin/verify-tag.o\n>    CC builtin/write-tree.o\n>    LINK git\n>    BUILTIN git-add\n>    BUILTIN git-annotate\n>    BUILTIN git-apply\n>    BUILTIN git-archive\n>    BUILTIN git-bisect--helper\n>    BUILTIN git-blame\n>    BUILTIN git-branch\n>    BUILTIN git-bundle\n>    BUILTIN git-cat-file\n>    BUILTIN git-check-attr\n>    BUILTIN git-check-ref-format\n>    BUILTIN git-checkout-index\n>    BUILTIN git-checkout\n>    BUILTIN git-clean\n>    BUILTIN git-clone\n>    BUILTIN git-commit-tree\n>    BUILTIN git-commit\n>    BUILTIN git-config\n>    BUILTIN git-count-objects\n>    BUILTIN git-describe\n>    BUILTIN git-diff-files\n>    BUILTIN git-diff-index\n>    BUILTIN git-diff-tree\n>    BUILTIN git-diff\n>    BUILTIN git-fast-export\n>    BUILTIN git-fetch-pack\n>    BUILTIN git-fetch\n>    BUILTIN git-fmt-merge-msg\n>    BUILTIN git-for-each-ref\n>    BUILTIN git-fsck\n>    BUILTIN git-gc\n>    BUILTIN git-grep\n>    BUILTIN git-hash-object\n>    BUILTIN git-help\n>    BUILTIN git-index-pack\n>    BUILTIN git-init-db\n>    BUILTIN git-log\n>    BUILTIN git-ls-files\n>    BUILTIN git-ls-remote\n>    BUILTIN git-ls-tree\n>    BUILTIN git-mailinfo\n>    BUILTIN git-mailsplit\n>    BUILTIN git-merge\n>    BUILTIN git-merge-base\n>    BUILTIN git-merge-file\n>    BUILTIN git-merge-index\n>    BUILTIN git-merge-ours\n>    BUILTIN git-merge-recursive\n>    BUILTIN git-merge-tree\n>    BUILTIN git-mktag\n>    BUILTIN git-mktree\n>    BUILTIN git-mv\n>    BUILTIN git-name-rev\n>    BUILTIN git-notes\n>    BUILTIN git-pack-objects\n>    BUILTIN git-pack-redundant\n>    BUILTIN git-pack-refs\n>    BUILTIN git-patch-id\n>    BUILTIN git-prune-packed\n>    BUILTIN git-prune\n>    BUILTIN git-push\n>    BUILTIN git-read-tree\n>    BUILTIN git-receive-pack\n>    BUILTIN git-reflog\n>    BUILTIN git-remote\n>    BUILTIN git-replace\n>    BUILTIN git-rerere\n>    BUILTIN git-reset\n>    BUILTIN git-rev-list\n>    BUILTIN git-rev-parse\n>    BUILTIN git-revert\n>    BUILTIN git-rm\n>    BUILTIN git-send-pack\n>    BUILTIN git-shortlog\n>    BUILTIN git-show-branch\n>    BUILTIN git-show-ref\n>    BUILTIN git-stripspace\n>    BUILTIN git-symbolic-ref\n>    BUILTIN git-tag\n>    BUILTIN git-tar-tree\n>    BUILTIN git-unpack-file\n>    BUILTIN git-unpack-objects\n>    BUILTIN git-update-index\n>    BUILTIN git-update-ref\n>    BUILTIN git-update-server-info\n>    BUILTIN git-upload-archive\n>    BUILTIN git-var\n>    BUILTIN git-verify-pack\n>    BUILTIN git-verify-tag\n>    BUILTIN git-write-tree\n>    BUILTIN git-cherry\n>    BUILTIN git-cherry-pick\n>    BUILTIN git-format-patch\n>    BUILTIN git-fsck-objects\n>    BUILTIN git-get-tar-commit-id\n>    BUILTIN git-init\n>    BUILTIN git-merge-subtree\n>    BUILTIN git-peek-remote\n>    BUILTIN git-repo-config\n>    BUILTIN git-show\n>    BUILTIN git-stage\n>    BUILTIN git-status\n>    BUILTIN git-whatchanged\n>    SUBDIR git-gui\n> GITGUI_VERSION = 0.12.0.64.g89d6\n>    * new locations or Tcl/Tk interpreter\n>    GEN git-gui\n>    INDEX lib/\n>    MSGFMT    po/de.msg 520 translated.\n>    MSGFMT    po/el.msg 381 translated, 4 fuzzy, 6 untranslated.\n>    MSGFMT    po/fr.msg 520 translated.\n>    MSGFMT    po/hu.msg 514 translated.\n>    MSGFMT    po/it.msg 519 translated, 1 untranslated.\n>    MSGFMT    po/ja.msg 520 translated.\n>    MSGFMT    po/nb.msg 474 translated, 39 untranslated.\n>    MSGFMT    po/ru.msg 513 translated, 2 untranslated.\n>    MSGFMT    po/sv.msg 520 translated.\n>    MSGFMT po/zh_cn.msg 366 translated, 7 fuzzy, 17 untranslated.\n>    SUBDIR gitk-git\n>    GEN gitk-wish\n> Generating catalog po/de.msg\n> msgfmt --statistics --tcl po/de.po -l de -d po/\n> 289 translated messages.\n> Generating catalog po/es.msg\n> msgfmt --statistics --tcl po/es.po -l es -d po/\n> 200 translated messages, 7 untranslated messages.\n> Generating catalog po/fr.msg\n> msgfmt --statistics --tcl po/fr.po -l fr -d po/\n> 276 translated messages, 4 fuzzy translations.\n> Generating catalog po/hu.msg\n> msgfmt --statistics --tcl po/hu.po -l hu -d po/\n> 288 translated messages.\n> Generating catalog po/it.msg\n> msgfmt --statistics --tcl po/it.po -l it -d po/\n> 283 translated messages, 6 untranslated messages.\n> Generating catalog po/ja.msg\n> msgfmt --statistics --tcl po/ja.po -l ja -d po/\n> 284 translated messages.\n> Generating catalog po/ru.msg\n> msgfmt --statistics --tcl po/ru.po -l ru -d po/\n> 245 translated messages.\n> Generating catalog po/sv.msg\n> msgfmt --statistics --tcl po/sv.po -l sv -d po/\n> 289 translated messages.\n>    SUBDIR perl\n> cp Git.pm blib/lib/Git.pm\n> Manifying blib/man3/Git.3pm\n>    SUBDIR git_remote_helpers\n>    SUBDIR templates\n>    CC test-chmtime.o\n>    LINK test-chmtime\n>    CC test-ctype.o\n>    LINK test-ctype\n>    CC test-date.o\n>    LINK test-date\n>    CC test-delta.o\n>    LINK test-delta\n>    CC test-dump-cache-tree.o\n>    LINK test-dump-cache-tree\n>    CC test-genrandom.o\n>    LINK test-genrandom\n>    CC test-match-trees.o\n>    LINK test-match-trees\n>    CC test-parse-options.o\n>    LINK test-parse-options\n>    CC test-path-utils.o\n>    LINK test-path-utils\n>    CC test-run-command.o\n>    LINK test-run-command\n>    CC test-sha1.o\n>    LINK test-sha1\n>    CC test-sigchain.o\n>    LINK test-sigchain\n>    CC test-index-version.o\n>    LINK test-index-version\n>    GEN bin-wrappers/git\n>    GEN bin-wrappers/git-upload-pack\n>    GEN bin-wrappers/git-receive-pack\n>    GEN bin-wrappers/git-upload-archive\n>    GEN bin-wrappers/git-shell\n>    GEN bin-wrappers/git-cvsserver\n>    GEN bin-wrappers/test-chmtime\n>    GEN bin-wrappers/test-ctype\n>    GEN bin-wrappers/test-date\n>    GEN bin-wrappers/test-delta\n>    GEN bin-wrappers/test-dump-cache-tree\n>    GEN bin-wrappers/test-genrandom\n>    GEN bin-wrappers/test-match-trees\n>    GEN bin-wrappers/test-parse-options\n>    GEN bin-wrappers/test-path-utils\n>    GEN bin-wrappers/test-run-command\n>    GEN bin-wrappers/test-sha1\n>    GEN bin-wrappers/test-sigchain\n>    GEN bin-wrappers/test-index-version\n> 6.  Install Git.\n> 6.1  Login as root.\n> 6.2  [root]# cd /home/git0/git-source/git-1.6.3.4\n> 6.3  [root]# make prefix=/usr install\n> 6.3 SAMPLE of GOOD OUTPUT for 1.7.1 install:\n> [root]# make prefix=/usr install\n>    SUBDIR git-gui\n>    SUBDIR gitk-git\n> make[1]: Nothing to be done for `all'.\n>    SUBDIR perl\n>    SUBDIR git_remote_helpers\n>    SUBDIR templates\n> install -d -m 755 '/usr/bin'\n> install -d -m 755 '/usr/libexec/git-core'\n> install   git-fast-import git-imap-send git-shell git-show-index \n> git-upload-pack\n> git-http-backend git-http-fetch git-http-push git-daemon git-remote-http \n> git-re\n> mote-https git-remote-ftp git-remote-ftps git-am git-bisect \n> git-difftool--helper\n> git-filter-branch git-lost-found git-merge-octopus git-merge-one-file \n> git-merge\n> -resolve git-mergetool git-pull git-quiltimport git-rebase--interactive \n> git-reba\n> se git-repack git-request-pull git-stash git-submodule git-web--browse \n> git-add--\n> interactive git-difftool git-archimport git-cvsexportcommit git-cvsimport \n> git-cv\n> sserver git-relink git-send-email git-svn  git-instaweb \n> '/usr/libexec/git-core'\n> install -m 644  git-mergetool--lib git-parse-remote git-sh-setup \n> '/usr/libexec/g\n> it-core'\n> install git git-upload-pack git-receive-pack git-upload-archive git-shell \n> git-cv\n> sserver '/usr/bin'\n> make -C templates DESTDIR='' install\n> make[1]: Entering directory `/home/git0/git-source/git-1.7.1/templates'\n> install -d -m 755 '/usr/share/git-core/templates'\n> (cd blt && tar cf - .) | \\\n>        (cd '/usr/share/git-core/templates' && umask 022 && tar xof -)\n> make[1]: Leaving directory `/home/git0/git-source/git-1.7.1/templates'\n> make -C perl prefix='/usr' DESTDIR='' install\n> make[1]: Entering directory `/home/git0/git-source/git-1.7.1/perl'\n> make[2]: Entering directory `/home/git0/git-source/git-1.7.1/perl'\n> Installing /usr/lib/perl5/site_perl/5.8.8/Git.pm\n> Installing /usr/share/man/man3/Git.3pm\n> Writing \n> /usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/auto/Git/.pac\n> klist\n> Appending installation info to \n> /usr/lib64/perl5/5.8.8/x86_64-linux-thread-multi/\n> perllocal.pod\n> make[2]: Leaving directory `/home/git0/git-source/git-1.7.1/perl'\n> make[1]: Leaving directory `/home/git0/git-source/git-1.7.1/perl'\n> make -C git_remote_helpers prefix='/usr' DESTDIR='' install\n> make[1]: Entering directory \n> `/home/git0/git-source/git-1.7.1/git_remote_helpers'\n>\n> /usr/bin/python setup.py install --prefix /usr\n> running install\n> running build\n> running build_py\n> running install_lib\n> copying build/lib/git_remote_helpers/git/git.py -> \n> /usr/lib/python2.4/site-packa\n> ges/git_remote_helpers/git\n> copying build/lib/git_remote_helpers/git/__init__.py -> \n> /usr/lib/python2.4/site-\n> packages/git_remote_helpers/git\n> copying build/lib/git_remote_helpers/util.py -> \n> /usr/lib/python2.4/site-packages\n> /git_remote_helpers\n> copying build/lib/git_remote_helpers/__init__.py -> \n> /usr/lib/python2.4/site-pack\n> ages/git_remote_helpers\n> byte-compiling \n> /usr/lib/python2.4/site-packages/git_remote_helpers/git/git.py to\n> git.pyc\n> byte-compiling \n> /usr/lib/python2.4/site-packages/git_remote_helpers/git/__init__.\n> py to __init__.pyc\n> byte-compiling /usr/lib/python2.4/site-packages/git_remote_helpers/util.py \n> to ut\n> il.pyc\n> byte-compiling \n> /usr/lib/python2.4/site-packages/git_remote_helpers/__init__.py t\n> o __init__.pyc\n> make[1]: Leaving directory \n> `/home/git0/git-source/git-1.7.1/git_remote_helpers'\n> make -C gitk-git install\n> make[1]: Entering directory `/home/git0/git-source/git-1.7.1/gitk-git'\n> install -m 755 gitk-wish '/usr/bin'/gitk\n> install -d -m 755 '/usr/share/gitk/lib/msgs'\n> install -m 644 po/de.msg '/usr/share/gitk/lib/msgs' &&  install -m 644 \n> po/es.msg\n> '/usr/share/gitk/lib/msgs' &&  install -m 644 po/fr.msg \n> '/usr/share/gitk/lib/ms\n> gs' &&  install -m 644 po/hu.msg '/usr/share/gitk/lib/msgs' &&  install -m \n> 644 p\n> o/it.msg '/usr/share/gitk/lib/msgs' &&  install -m 644 po/ja.msg \n> '/usr/share/git\n> k/lib/msgs' &&  install -m 644 po/ru.msg '/usr/share/gitk/lib/msgs' && \n> install\n> -m 644 po/sv.msg '/usr/share/gitk/lib/msgs' && true\n> make[1]: Leaving directory `/home/git0/git-source/git-1.7.1/gitk-git'\n> make -C git-gui gitexecdir='/usr/libexec/git-core' install\n> make[1]: Entering directory `/home/git0/git-source/git-1.7.1/git-gui'\n>  DEST /usr/libexec/git-core\n>    INSTALL 755 git-gui\n>    INSTALL 755 git-gui--askpass\n>    LINK        git-citool -> git-gui\n>  DEST /usr/share/git-gui/lib\n>    INSTALL 644 tclIndex\n>    INSTALL 644 about.tcl\n>    INSTALL 644 blame.tcl\n>    INSTALL 644 branch.tcl\n>    INSTALL 644 branch_checkout.tcl\n>    INSTALL 644 branch_create.tcl\n>    INSTALL 644 branch_delete.tcl\n>    INSTALL 644 branch_rename.tcl\n>    INSTALL 644 browser.tcl\n>    INSTALL 644 checkout_op.tcl\n>    INSTALL 644 choose_font.tcl\n>    INSTALL 644 choose_repository.tcl\n>    INSTALL 644 choose_rev.tcl\n>    INSTALL 644 class.tcl\n>    INSTALL 644 commit.tcl\n>    INSTALL 644 console.tcl\n>    INSTALL 644 database.tcl\n>    INSTALL 644 date.tcl\n>    INSTALL 644 diff.tcl\n>    INSTALL 644 encoding.tcl\n>    INSTALL 644 error.tcl\n>    INSTALL 644 index.tcl\n>    INSTALL 644 logo.tcl\n>    INSTALL 644 merge.tcl\n>    INSTALL 644 mergetool.tcl\n>    INSTALL 644 option.tcl\n>    INSTALL 644 remote.tcl\n>    INSTALL 644 remote_add.tcl\n>    INSTALL 644 remote_branch_delete.tcl\n>    INSTALL 644 search.tcl\n>    INSTALL 644 shortcut.tcl\n>    INSTALL 644 spellcheck.tcl\n>    INSTALL 644 sshkey.tcl\n>    INSTALL 644 status_bar.tcl\n>    INSTALL 644 themed.tcl\n>    INSTALL 644 tools.tcl\n>    INSTALL 644 tools_dlg.tcl\n>    INSTALL 644 transport.tcl\n>    INSTALL 644 win32.tcl\n>    INSTALL 644 git-gui.ico\n>    INSTALL 644 win32_shortcut.js\n>  DEST /usr/share/git-gui/lib/msgs\n>    INSTALL 644 de.msg\n>    INSTALL 644 el.msg\n>    INSTALL 644 fr.msg\n>    INSTALL 644 hu.msg\n>    INSTALL 644 it.msg\n>    INSTALL 644 ja.msg\n>    INSTALL 644 nb.msg\n>    INSTALL 644 ru.msg\n>    INSTALL 644 sv.msg\n>    INSTALL 644 zh_cn.msg\n> make[1]: Leaving directory `/home/git0/git-source/git-1.7.1/git-gui'\n> bindir=$(cd '/usr/bin' && pwd) && \\\n>        execdir=$(cd '/usr/libexec/git-core' && pwd) && \\\n>        { test \"$bindir/\" = \"$execdir/\" || \\\n>                { rm -f \"$execdir/git\" && \\\n>                test -z \"\" && \\\n>                ln \"$bindir/git\" \"$execdir/git\" 2>/dev/null || \\\n>                cp \"$bindir/git\" \"$execdir/git\"; } ; } && \\\n>        { for p in  git-add git-annotate git-apply git-archive \n> git-bisect--helpe\n> r git-blame git-branch git-bundle git-cat-file git-check-attr \n> git-check-ref-form\n> at git-checkout-index git-checkout git-clean git-clone git-commit-tree \n> git-commi\n> t git-config git-count-objects git-describe git-diff-files git-diff-index \n> git-di\n> ff-tree git-diff git-fast-export git-fetch-pack git-fetch \n> git-fmt-merge-msg git-\n> for-each-ref git-fsck git-gc git-grep git-hash-object git-help \n> git-index-pack gi\n> t-init-db git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo \n> git-mailsp\n> lit git-merge git-merge-base git-merge-file git-merge-index git-merge-ours \n> git-m\n> erge-recursive git-merge-tree git-mktag git-mktree git-mv git-name-rev \n> git-notes\n> git-pack-objects git-pack-redundant git-pack-refs git-patch-id \n> git-prune-packed\n> git-prune git-push git-read-tree git-receive-pack git-reflog git-remote \n> git-rep\n> lace git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm \n> git-send-\n> pack git-shortlog git-show-branch git-show-ref git-stripspace \n> git-symbolic-ref g\n> it-tag git-tar-tree git-unpack-file git-unpack-objects git-update-index \n> git-upda\n> te-ref git-update-server-info git-upload-archive git-var git-verify-pack \n> git-ver\n> ify-tag git-write-tree git-cherry git-cherry-pick git-format-patch \n> git-fsck-obje\n> cts git-get-tar-commit-id git-init git-merge-subtree git-peek-remote \n> git-repo-co\n> nfig git-show git-stage git-status git-whatchanged; do \\\n>                rm -f \"$execdir/$p\" && \\\n>                ln \"$execdir/git\" \"$execdir/$p\" 2>/dev/null || \\\n>                ln -s \"git\" \"$execdir/$p\" 2>/dev/null || \\\n>                cp \"$execdir/git\" \"$execdir/$p\" || exit; \\\n>          done; } && \\\n>        { for p in git-remote-https git-remote-ftp git-remote-ftps; do \\\n>                rm -f \"$execdir/$p\" && \\\n>                ln \"$execdir/git-remote-http\" \"$execdir/$p\" 2>/dev/null || \n> \\\n>                ln -s \"git-remote-http\" \"$execdir/$p\" 2>/dev/null || \\\n>                cp \"$execdir/git-remote-http\" \"$execdir/$p\" || exit; \\\n>          done; } && \\\n>        ./check_bindir \"z$bindir\" \"z$execdir\" \"$bindir/git-add\"\n> [root]#\n> 7.  Validate Git.\n> 7.1  See what version of git is installed.\n> [neal]$ git --version\n> 7.2  See where git is installed.\n> [neal]$ git --exec-path\n> 7.3  VNC to gui desktop.\n> Open Terminal.\n> [neal]$ gitk  validate that gitk executes and displays.\n> [neal]$ git gui  validate that git gui executes and displays.\n> Note:  Only after you have a local repository working tree can you can \n> validate xdg-utils as follows:\n> <Repository> -> <Browse Master's Files>  validate's xdg-utils.\n>\n>\n> GIT INSTALL.  PART 2.  INSTALL GIT RELATED TOOLS.\n> 1.  Install KDiff3.  Merge tool.\n> 1.1  [root]# yum list kdiff3  (See if its already installed.)\n> 1.2  [root]# yum install kdiff3  (Install it if it is not already \n> installed.)\n> 1.3  [root]# yum list kdiff3  (Verify that it is installed.)\n> 1.3  SAMPLE OUTPUT:\n> kdiff3.x86_64                      0.9.92-14.el5 installed\n>\n>\n> Like I said, this is what has worked for me.  Hope this helps!\n>\n> (If anyone has any *PROVEN* improvements and/or additions to my procedures \n> then by all means let me know...)\n>\n>\n> v/r,\n> Neal\n\nPatrick,\n\nIf your 'yum list' commands shows that you don't have a package installed or \nthere is a newer version of the package then you will need to install/update \nthat package.  Here are my notes:\n\nA1.  LINUX PACKAGE MANAGEMENT PRIMER.\nSoftware Installation and Updates.\n\nroot Access\n[neal]$ su root\nuse the \"su root\" (switch user) command to access root authority whenever \npossible.  Most root commands will run from here.  If the command returns\nbash: adduser: command not found\nthen \"su root\" does not have access and you must actually login as root to \nexecute that command.\nType \"exit\" to switch back to your previous signon from \"su\".\n\"su\" is the same as \"su root\".\n\nSoftware Update Commands\nyum\nyum installs and updates software packages (RPMs).\n\nRPM:  a software package.\n\nrpm name formats:\n*.i386  32-bit software package.  Use these rpms if your OS is 32-bit. \n32-bit OS cannot run 64-bit rpms.\n*.x86_64  64-bit software package.  Use these rpms if your OS is 64-bit. \n64-bit OS can run 32-bit and 64-bit rpms.  64-bit is preferred.\n\n$ yum list packagename\nlists RPMs that are already installed or available to be installed.\n\nInstalled Packages  RPMs that are already installed.\n\nAvailable Packages  RPMs that are not currently installed, but that are \navailable on the software repositories for installation or update.\n\n$ yum update packagename\nupdates already installed software package (RPM) to newer version.\nrequires root login.\n\n$ yum install packagename\ninstalls package for the first time.\nrequires root login.\n\n(You probably already know this stuff, but I'm including it so my \ninstructions are more comprehensive)\n\nv/r,\nNeal \n"},{"id":"157425","messageId":"AANLkTinWsUumcYOKeohWVdrSPZexd=_-5wyiV6-nE4HP@mail.gmail.com","threadId":"25940","inReplyTo":"idjd25$ajd$1@dough.gmane.org","subject":"Re: path/to/some/file: needs update","fromName":"Patrick Doyle","fromEmail":"wpdster@gmail.com","sentAt":"2010-12-06T19:23:19Z","receivedAt":"2010-12-06T19:23:19Z","isPatch":false,"sender":{"key":"wpdster@gmail.com","avatar":null},"body":"On Mon, Dec 6, 2010 at 2:19 PM, Neal Kreitzinger <neal@rsss.com> wrote:\n> \"Neal Kreitzinger\" <neal@rsss.com> wrote in message\n>> Hi, Patrick,\n>>\n>> There isn't an RHEL or EPEL rpm for a current version of git.  What you'll\n>> need to do is build git yourself using the tarball download from git.  The\n>\n> v/r,\n> Neal\nHi Neal,\nThanks for the tip.  I won't spend too much time looking for a newer\nRPM.  As you indicated, it should be pretty easy to install from\nsource.\n\nThanks.\n\n--wpd\n"},{"id":"157437","messageId":"1291668405-sup-122@pinkfloyd.chass.utoronto.ca","threadId":"25940","inReplyTo":"AANLkTinFHFzjLNb5PpoH8WG_3gHpo4LaZaUOYX-=PFYN@mail.gmail.com","subject":"Re: path/to/some/file: needs update","fromName":"Ben Walton","fromEmail":"bwalton@artsci.utoronto.ca","sentAt":"2010-12-06T20:47:27Z","receivedAt":"2010-12-06T20:47:27Z","isPatch":false,"sender":{"key":"bdwalton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/396061?v=4"},"body":"Excerpts from Patrick Doyle's message of Sun Dec 05 19:44:32 -0500 2010:\n\n> I just checked.  The box they were using is an RHEL 5 box that has\n> 1.5.5.6 installed on it.  Perhaps it's time to upgrade their git.\n> I'll go see what repo I need to add to RHEL to get a more recent\n> git.\n\nI maintain a local set of 1.7.x rpms for git that are built for rhel5\nhere.  I'm happy to share if it would help.\n\nThanks\n-Ben\n--\nBen Walton\nSystems Programmer - CHASS\nUniversity of Toronto\nC:416.407.5610 | W:416.978.4302\n"},{"id":"157487","messageId":"1291735394.3162.14.camel@drew-northup.unet.maine.edu","threadId":"25940","inReplyTo":"1291668405-sup-122@pinkfloyd.chass.utoronto.ca","subject":"Re: path/to/some/file: needs update","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2010-12-07T15:23:14Z","receivedAt":"2010-12-07T15:23:14Z","isPatch":false,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"\nOn Mon, 2010-12-06 at 15:47 -0500, Ben Walton wrote:\n> Excerpts from Patrick Doyle's message of Sun Dec 05 19:44:32 -0500 2010:\n> \n> > I just checked.  The box they were using is an RHEL 5 box that has\n> > 1.5.5.6 installed on it.  Perhaps it's time to upgrade their git.\n> > I'll go see what repo I need to add to RHEL to get a more recent\n> > git.\n> \n> I maintain a local set of 1.7.x rpms for git that are built for rhel5\n> here.  I'm happy to share if it would help.\n> \n> Thanks\n> -Ben\n\nDag Wieers (rpmforge) maintains a decent git package for RHEL5 as well.\n\n-- \n-Drew Northup N1XIM\n   AKA RvnPhnx on OPN\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"}]}