1. 21 Mar, 2013 1 commit
  2. 01 Feb, 2013 1 commit
    • Junio C Hamano's avatar
      git-am: record full index line in the patch used while rebasing · 4ae6d469
      Junio C Hamano authored
      Earlier, a2309494 (am --rebasing: get patch body from commit, not
      from mailbox, 2012-06-26) learned to regenerate patch body from the
      commit object while rebasing, instead of reading from the rebase-am
      front-end.  While doing so, it used "git diff-tree" but without
      giving it the "--full-index" option.
      
      This does not matter for in-repository objects; during rebasing, any
      abbreviated object name should uniquely identify them.
      
      But we may be rebasing a commit that contains a change to a gitlink,
      in which case we usually should not have the object (it names a
      commit in the submodule).  A full object name is necessary to later
      reconstruct a fake ancestor index for them.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      4ae6d469
  3. 18 Jan, 2013 1 commit
  4. 22 Aug, 2012 1 commit
  5. 27 Jul, 2012 2 commits
  6. 25 Jul, 2012 1 commit
  7. 13 Jul, 2012 1 commit
    • Paul Gortmaker's avatar
      am: indicate where a failed patch is to be found · 14bf2d58
      Paul Gortmaker authored
      If "git am" fails to apply something, the end user may need to know
      where to find the patch that failed to apply, so that the user can
      do other things (e.g. trying "GNU patch" on it, running "diffstat"
      to see what it tried to change, etc.)  The input to "am" may have
      contained more than one patch, or the message may have been MIME
      encoded, and knowing what the user fed to "am" does not help very
      much for this purpose.
      
      Also introduce advice.amworkdir configuration to allow people who
      learned where to look to squelch this message.
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      14bf2d58
  8. 26 Jun, 2012 2 commits
  9. 28 Mar, 2012 2 commits
  10. 13 Mar, 2012 1 commit
    • Junio C Hamano's avatar
      am: officially deprecate -b/--binary option · 6c15a1c6
      Junio C Hamano authored
      We have had these options as harmless no-op for more than 3 years without
      officially deprecating them.  Let's announce the deprecation and start
      warning against their use, but without failing the command just not yet,
      so that we can later repurpose the option if we want to in the future.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      6c15a1c6
  11. 12 Mar, 2012 1 commit
  12. 27 Feb, 2012 1 commit
  13. 23 Feb, 2012 1 commit
    • Junio C Hamano's avatar
      am -3: allow nonstandard -p<num> option · 4056afbc
      Junio C Hamano authored
      When falling back to 3-way merge, we run "git apply" to synthesize the
      fake ancestor tree by parsing the incoming patch, and another "git apply"
      to apply the patch to the fake ancestor tree.  Both invocation need to
      be aware of the custom -p<num> setting to parse patches that were prepared
      with non-standard src/dst prefix.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      4056afbc
  14. 17 Jan, 2012 1 commit
  15. 09 Dec, 2011 1 commit
  16. 29 Aug, 2011 3 commits
  17. 16 Aug, 2011 1 commit
    • Jeff King's avatar
      am: refresh the index at start and --resolved · 2a6f08ac
      Jeff King authored
      If a file is unchanged but stat-dirty, we may erroneously
      fail to apply patches, thinking that they conflict with a
      dirty working tree.
      
      This patch adds a call to "update-index --refresh". It comes
      as late as possible, so that we don't bother with it for
      thinks like "git rebase --abort", or when mbox-splitting
      fails. However, it does come before we actually start
      applying patches, meaning we will only call it once when we
      start applying patches (or any time we return to "am" after
      having resolved conflicts), and not once per patch.
      Signed-off-by: default avatarJeff King <peff@peff.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      2a6f08ac
  18. 11 Aug, 2011 1 commit
    • David Barr's avatar
      am: ignore leading whitespace before patch · 0e8341f2
      David Barr authored
      Some web-based email clients prepend whitespace to raw message
      transcripts to workaround content-sniffing in some browsers.  Adjust
      the patch format detection logic to ignore leading whitespace.
      
      So now you can apply patches from GMail with "git am" in three steps:
      
       1. choose "show original"
       2. tell the browser to "save as" (for example by pressing Ctrl+S)
       3. run "git am" on the saved file
      
      This fixes a regression introduced by v1.6.4-rc0~15^2~2 (git-am
      foreign patch support: autodetect some patch formats, 2009-05-27).
      GMail support was first introduced to "git am" by v1.5.4-rc0~274^2
      (Make mailsplit and mailinfo strip whitespace from the start of the
      input, 2007-11-01).
      Signed-off-by: default avatarDavid Barr <davidbarr@google.com>
      Signed-off-by: default avatarJonathan Nieder <jrnieder@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      0e8341f2
  19. 08 Aug, 2011 1 commit
  20. 03 Aug, 2011 1 commit
  21. 21 May, 2011 12 commits
  22. 23 Dec, 2010 1 commit
  23. 21 Dec, 2010 1 commit
    • Junio C Hamano's avatar
      am --abort: keep unrelated commits since the last failure and warn · 7b3b7e37
      Junio C Hamano authored
      After making commits (either by pulling or doing their own work) after a
      failed "am", the user will be reminded by next "am" invocation that there
      was a failed "am" that the user needs to decide to resolve or to get rid
      of the old "am" attempt.  The "am --abort" option was meant to help the
      latter.  However, it rewinded the HEAD back to the beginning of the failed
      "am" attempt, discarding commits made (perhaps by mistake) since.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      7b3b7e37
  24. 13 Oct, 2010 1 commit