This project is mirrored from https://github.com/git/git. Pull mirroring updated .
  1. 25 Jun, 2005 13 commits
  2. 24 Jun, 2005 1 commit
  3. 23 Jun, 2005 9 commits
  4. 22 Jun, 2005 15 commits
  5. 21 Jun, 2005 2 commits
    • Linus Torvalds's avatar
      Remove MERGE_HEAD in "git checkout/reset" · ef0bfa25
      Linus Torvalds authored
      Both of these scripts will end up resetting the index to some specific
      head, and any unresolved merge will be forgotten.
      ef0bfa25
    • Linus Torvalds's avatar
      Clean up different special *HEAD handling · 6b38a402
      Linus Torvalds authored
      We codify the following different heads (in addition to the main "HEAD",
      which points to the current branch, of course):
      
       - FETCH_HEAD
      
         Populated by "git fetch"
      
       - ORIG_HEAD
      
         The old HEAD before a "git pull/resolve" (successful or not)
      
       - LAST_MERGE
      
         The HEAD we're currently merging in "git pull/resolve"
      
       - MERGE_HEAD
      
         The previous head of a unresolved "git pull", which gets committed by
         a "git commit" after manually resolving the result
      
      We used to have "MERGE_HEAD" be populated directly by the fetch, and we
      removed ORIG_HEAD and LAST_MERGE too aggressively.
      6b38a402