1. 29 Jul, 2013 1 commit
  2. 18 Oct, 2012 1 commit
  3. 16 Sep, 2012 1 commit
  4. 29 Mar, 2011 3 commits
  5. 17 Nov, 2010 2 commits
    • Johan Herland's avatar
      git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" · a6a09095
      Johan Herland authored
      This new strategy is similar to "concatenate", but in addition to
      concatenating the two note candidates, this strategy sorts the resulting
      lines, and removes duplicate lines from the result. This is equivalent to
      applying the "cat | sort | uniq" shell pipeline to the two note candidates.
      This strategy is useful if the notes follow a line-based format where one
      wants to avoid duplicate lines in the merge result.
      Note that if either of the note candidates contain duplicate lines _prior_
      to the merge, these will also be removed by this merge strategy.
      The patch also contains tests and documentation for the new strategy.
      Signed-off-by: default avatarJohan Herland <johan@herland.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    • Johan Herland's avatar
      notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond · 180619a5
      Johan Herland authored
      The combine_notes_fn functions uses a non-zero return value to indicate
      failure. However, this return value was converted to a call to die()
      in note_tree_insert().
      Instead, propagate this return value out to add_note(), and return it
      from there to enable the caller to handle errors appropriately.
      Existing add_note() callers are updated to die() upon failure, thus
      preserving the current behaviour. The only exceptions are copy_note()
      and notes_cache_put() where we are able to propagate the add_note()
      return value instead.
      This patch has been improved by the following contributions:
      - Jonathan Nieder: Future-proof by always checking add_note() return value
      - Jonathan Nieder: Improve clarity of final if-condition in note_tree_insert()
      Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
      Signed-off-by: default avatarJohan Herland <johan@herland.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
  6. 10 Nov, 2010 3 commits
  7. 31 Aug, 2010 1 commit
  8. 24 Jun, 2010 1 commit
  9. 20 May, 2010 1 commit
  10. 07 Apr, 2010 1 commit
  11. 13 Mar, 2010 3 commits
  12. 14 Feb, 2010 11 commits
  13. 20 Oct, 2009 3 commits
  14. 11 Feb, 2009 1 commit
  15. 21 Dec, 2008 1 commit
    • Johannes Schindelin's avatar
      Introduce commit notes · 879ef248
      Johannes Schindelin authored
      Commit notes are blobs which are shown together with the commit
      message.  These blobs are taken from the notes ref, which you can
      configure by the config variable core.notesRef, which in turn can
      be overridden by the environment variable GIT_NOTES_REF.
      The notes ref is a branch which contains "files" whose names are
      the names of the corresponding commits (i.e. the SHA-1).
      The rationale for putting this information into a ref is this: we
      want to be able to fetch and possibly union-merge the notes,
      maybe even look at the date when a note was introduced, and we
      want to store them efficiently together with the other objects.
      Signed-off-by: Johannes Schindelin's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>