Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 19 9月, 2005 1 次提交
  3. 18 9月, 2005 1 次提交
  5. 16 9月, 2005 3 次提交
  7. 13 9月, 2005 2 次提交
  9. 11 9月, 2005 4 次提交
    • J
      Prepare 0.99.7 release candidate branch. · 53e2cc9b
      由 Junio C Hamano 提交于 
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      53e2cc9b
    • J
      Add a new merge strategy by Fredrik Kuivinen. · 720d150c
      由 Junio C Hamano 提交于 
      I really wanted to try this out, instead of asking for an adjustment
to the 'git merge' driver and waiting.  For now the new strategy is
called 'fredrik' and not in the list of default strategies to be tried.

The script wants Python 2.4 so this commit also adjusts Debian and RPM
build procecure files.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      720d150c
    • J
      Use Daniel's read-tree in the merge strategy 'resolve'. · 2276aa6c
      由 Junio C Hamano 提交于 
      And rename the one Linus kept calling stupid, 'stupid'.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      2276aa6c
    • J
      Multi-backend merge driver. · 91063bbc
      由 Junio C Hamano 提交于 
      The new command 'git merge' takes the current head and one or more
remote heads, with the commit log message for the automated case.

If the heads being merged are simple fast-forwards, it acts the
same way as the current 'git resolve'.  Otherwise, it tries
different merge strategies and takes the result from the one that
succeeded auto-merging, if there is any.

If no merge strategy succeeds auto-merging, their results are
evaluated for number of paths needed for hand resolving, and the
one with the least number of such paths is left in the working
tree.  The user is asked to resolve them by hand and make a
commit manually.

The calling convention from the 'git merge' driver to merge
strategy programs is very simple:

 - A strategy program is to be called 'git-merge-<strategy>'.

 - They take input of this form:

	<common1> <common2> ... '--' <head> <remote1> <remote2>...

   That is, one or more the common ancestors, double dash, the
   current head, and one or more remote heads being merged into
   the current branch.

 - Before a strategy program is called, the working tree is
   matched to the current <head>.

 - The strategy program exits with status code 0 when it
   successfully auto-merges the given heads.  It should do
   update-cache for all the merged paths when it does so -- the
   index file will be used to record the merge result as a
   commit by the driver.

 - The strategy program exits with status code 1 when it leaves
   conflicts behind.  It should do update-cache for all the
   merged paths that it successfully auto-merged, and leave the
   cache entry in the index file as the same as <head> for paths
   it could not auto-merge, and leave its best-effort result
   with conflict markers in the working tree when it does so.

 - The strategy program exists with status code other than 0 or
   1 if it does not handle the given merge at all.

As examples, this commit comes with merge strategies based on
'git resolve' and 'git octopus'.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      91063bbc
  11. 10 9月, 2005 2 次提交
  13. 09 9月, 2005 1 次提交
    • J
      'build' scripts before installing. · bc6146d2
      由 Junio C Hamano 提交于 
      Earlier we renamed git-foo.sh to git-foo while installing, which
was mostly done by inertia than anything else.  This however
made writing tests to use scripts harder.

This patch builds the scripts the same way as we build binaries
from their sources.  As a side effect, you can now specify
non-standard paths you have your Perl binary is in when running
the make.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      bc6146d2
  15. 08 9月, 2005 4 次提交
    • J
      git --version tells which version of git you have. · 6a2e50f9
      由 Junio C Hamano 提交于 
      Originally from Martin Atukunda <matlads@dsmagic.com> but adjusted for
post-rename code.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      6a2e50f9
    • P
      [PATCH] Portability fix for Solaris 10/x86 · f0ebff0d
      由 Patrick Mauritz 提交于 
       * getdomainname unavailable there.
 * needs -lsocket for linkage.
 * needs __EXTENSIONS__ at the beginning of convert-objects.c

[JC: I've done this slightly differently from what Patrick originally
sent to the list and dropped the bit that deals with installations
that has curl header and library at non-default location.  I am
resisting the slipperly slope called autoconf.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f0ebff0d
    • J
      Big tool rename. · 215a7ad1
      由 Junio C Hamano 提交于 
      As promised, this is the "big tool rename" patch.  The primary differences
since 0.99.6 are:

  (1) git-*-script are no more.  The commands installed do not
      have any such suffix so users do not have to remember if
      something is implemented as a shell script or not.

  (2) Many command names with 'cache' in them are renamed with
      'index' if that is what they mean.

There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support  is expected to be removed in the near
future.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      215a7ad1
    • J
      Flatten tools/ directory to make build procedure simpler. · 597c9cc5
      由 Junio C Hamano 提交于 
      Also make platform specific part more isolated.  Currently we only
have Darwin defined, but I've taken a look at SunOS specific patch
(which I dropped on the floor for now) as well.  Doing things this way
would make adding it easier.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      597c9cc5
  17. 05 9月, 2005 2 次提交
  19. 30 8月, 2005 2 次提交
    • J
      Remove git-apply-patch-script. · e47e35ac
      由 Junio C Hamano 提交于 
      Now the rebase is rewritten to use git cherry-pick, there is no user
for that ancient script.  I've checked Cogito and StGIT to make sure
they do not use it.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      e47e35ac
    • J
      Redo "revert" using three-way merge machinery. · 48313592
      由 Junio C Hamano 提交于 
      The reverse patch application using "git apply" sometimes is too
rigid.  Since the user would get used to resolving conflicting merges
by hand during the normal merge experience, using the same machinery
would be more helpful rather than just giving up.

Cherry-picking and reverting are essentially the same operation.
You pick one commit, and apply the difference that commit introduces
to its own commit ancestry chain to the current tree.  Revert applies
the diff in reverse while cherry-pick applies it forward.  They share
the same logic, just different messages and merge direction.

Rewrite "git rebase" using "git cherry-pick".
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      48313592
  21. 27 8月, 2005 1 次提交
    • J
      Enable git-send-email-script on Debian. · 90bc118f
      由 Junio C Hamano 提交于 
      You can define WITH_SEND_EMAIL to include the send-email command as
part of the installation.  Since Debian, unlike RPM/Fedora, has the
two necessary Perl modules available as part of the mainline
distribution, there is no reason for us to shy away from shipping
send-email.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      90bc118f
  23. 25 8月, 2005 4 次提交
  25. 23 8月, 2005 2 次提交
    • J
      Clean-up output from "git show-branch" and document it. · f5e375c9
      由 Junio C Hamano 提交于 
      When showing only one branch a lot of default output becomes redundant,
so clean it up a bit, and document what is shown.  Retire the earlier
implementation "git-show-branches-script".
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f5e375c9
    • J
      [PATCH] Add 'git show-branch'. · f76412ed
      由 Junio C Hamano 提交于 
      The 'git show-branches' command turns out to be reasonably useful,
but painfully slow.  So rewrite it in C, using ideas from merge-base
while enhancing it a bit more.

 - Unlike show-branches, it can take --heads (show me all my
   heads), --tags (show me all my tags), or --all (both).

 - It can take --more=<number> to show beyond the merge-base.

 - It shows the short name for each commit in the extended SHA1
   syntax.

 - It can find merge-base for more than two heads.

Examples:

    $ git show-branch --more=6 HEAD

    is almost the same as "git log --pretty=oneline --max-count=6".

    $ git show-branch --merge-base master mhf misc

    finds the merge base of the three given heads.

    $ git show-branch master mhf misc

    shows logs from the top of these three branch heads, up to their
    common ancestor commit is shown.

    $ git show-branch --all --more=10

    is poor-man's gitk, showing all the tags and heads, and
    going back 10 commits beyond the merge base of those refs.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f76412ed
  27. 17 8月, 2005 1 次提交
  29. 15 8月, 2005 1 次提交
    • J
      Add git-show-branches-script · 7c27558c
      由 Junio C Hamano 提交于 
      Often I find myself wanting to do quick branches check when I am
not in the windowing environment and cannot run gitk.

This stupid script shows commits leading to the heads of
interesting branches with indication which ones belong to which
branches, so that fork point is somewhat discernible without
using gitk.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      7c27558c
  31. 13 8月, 2005 5 次提交
  33. 12 8月, 2005 1 次提交
  35. 11 8月, 2005 1 次提交
  37. 10 8月, 2005 2 次提交
    • J
      git-revert: revert an existing commit. · 045f82cb
      由 Junio C Hamano 提交于 
      Given one existing commit, revert the change the patch
introduces, and record a new commit that records it.  This
requires your working tree to be clean (no modifications from
the HEAD commit).

This is based on what Linus posted to the list, with
enhancements he suggested, including the use of -M to attempt
reverting renames.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      045f82cb
    • J
      Downgrade git-send-email-script · 93b5fcdd
      由 Junio C Hamano 提交于 
      RPM folks have problem installing the package otherwise.  Since
its usefulness does have much to do with GIT, downgrade it to
"contrib" status for now.  We may want to move it to contrib/
subdirectory after auditing other programs when we reorganize
the source tree.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      93b5fcdd