Commits

Branch selector

 master

User selector

jherland

Datepicker

All time

Commit History

Commits on Mar 15, 2012

• notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd

  Show description for dabba59
  

  jherland

  authored and

  gitster

  committed
  dabba59

  Copy full SHA for dabba59

• notes-merge: use opendir/readdir instead of using read_directory()

  Show description for a0be62c
  

  jherland

  authored and

  gitster

  committed
  a0be62c

  Copy full SHA for a0be62c

• t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/

  Show description for 01bfec8
  

  jherland

  authored and

  gitster

  committed
  01bfec8

  Copy full SHA for 01bfec8

Commits on Nov 29, 2011

• fast-import: Fix incorrect fanout level when modifying existing notes refs

  Show description for 1838685
  

  jherland

  authored and

  gitster

  committed
  1838685

  Copy full SHA for 1838685

• t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling

  Show description for 9ff5e21
  

  jherland

  authored and

  gitster

  committed
  9ff5e21

  Copy full SHA for 9ff5e21

• t9301: Fix testcase covering up a bug in fast-import's notes fanout handling

  Show description for d107541
  

  jherland

  authored and

  gitster

  committed
  d107541

  Copy full SHA for d107541

Commits on May 13, 2011

• t5400: Fix a couple of typos

  Show description for ebe8621
  

  jherland

  authored and

  gitster

  committed
  ebe8621

  Copy full SHA for ebe8621

Commits on Apr 29, 2011

• Mark dirstat error messages for translation

  Show description for 7478ac5
  

  jherland

  authored and

  gitster

  committed
  7478ac5

  Copy full SHA for 7478ac5

• Improve error handling when parsing dirstat parameters

  Show description for 51670fc
  

  jherland

  authored and

  gitster

  committed
  51670fc

  Copy full SHA for 51670fc

• New --dirstat=lines mode, doing dirstat analysis based on diffstat

  Show description for 1c57a62
  

  jherland

  authored and

  gitster

  committed
  1c57a62

  Copy full SHA for 1c57a62

• Allow specifying --dirstat cut-off percentage as a floating point number

  Show description for 712d2c7
  

  jherland

  authored and

  gitster

  committed
  712d2c7

  Copy full SHA for 712d2c7

• Add config variable for specifying default --dirstat behavior

  Show description for 2d17495
  

  jherland

  authored and

  gitster

  committed
  2d17495

  Copy full SHA for 2d17495

• Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file

  Show description for 333f3fb
  

  jherland

  authored and

  gitster

  committed
  333f3fb

  Copy full SHA for 333f3fb

• Make --dirstat=0 output directories that contribute < 0.1% of changes

  Show description for 58a8756
  

  jherland

  authored and

  gitster

  committed
  58a8756

  Copy full SHA for 58a8756

• Add several testcases for --dirstat and friends

  Show description for 5502039
  

  jherland

  authored and

  gitster

  committed
  5502039

  Copy full SHA for 5502039

Commits on Apr 12, 2011

• --dirstat: In case of renames, use target filename instead of source filename

  Show description for 2ca8671
  

  jherland

  authored and

  gitster

  committed
  2ca8671

  Copy full SHA for 2ca8671

Commits on Apr 11, 2011

• Teach --dirstat not to completely ignore rearranged lines within a file

  Show description for 2ff3a80
  

  jherland

  authored and

  gitster

  committed
  2ff3a80

  Copy full SHA for 2ff3a80

• --dirstat-by-file: Make it faster and more correct

  Show description for 0133dab
  

  jherland

  authored and

  gitster

  committed
  0133dab

  Copy full SHA for 0133dab

• --dirstat: Describe non-obvious differences relative to --stat or regular diff

  Show description for 204f01a
  

  jherland

  authored and

  gitster

  committed
  204f01a

  Copy full SHA for 204f01a

Commits on Mar 30, 2011

• Make "git notes add" more user-friendly when there are existing notes

  Show description for 84a7e35
  

  jherland

  authored and

  gitster

  committed
  84a7e35

  Copy full SHA for 84a7e35

• log/pretty-options: Document --[no-]notes and deprecate old notes options

  Show description for ab18b2c
  

  jherland

  authored and

  gitster

  committed
  ab18b2c

  Copy full SHA for ab18b2c

Commits on Feb 17, 2011

• branch/checkout --track: Ensure that upstream branch is indeed a branch

  Show description for 21b5b1e
  

  jherland

  authored and

  gitster

  committed
  21b5b1e

  Copy full SHA for 21b5b1e

Commits on Feb 16, 2011

• push.default: Rename 'tracking' to 'upstream'

  Show description for 53c4031
  

  jherland

  authored and

  gitster

  committed
  53c4031

  Copy full SHA for 53c4031

Commits on Nov 17, 2010

• Provide 'git merge --abort' as a synonym to 'git reset --merge'

  Show description for 35d2fff
  

  jherland

  authored and

  gitster

  committed
  35d2fff

  Copy full SHA for 35d2fff

• cmd_merge(): Parse options before checking MERGE_HEAD

  Show description for 2a22c1b
  

  jherland

  authored and

  gitster

  committed
  2a22c1b

  Copy full SHA for 2a22c1b

• Provide 'git notes get-ref' to easily retrieve current notes ref

  Show description for 618cd75
  

  jherland

  authored and

  gitster

  committed
  618cd75

  Copy full SHA for 618cd75

• git notes merge: Add testcases for merging notes trees at different fanouts

  Show description for 305ddd4
  

  jherland

  authored and

  gitster

  committed
  305ddd4

  Copy full SHA for 305ddd4

• git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"

  Show description for a6a0909
  

  jherland

  authored and

  gitster

  committed
  a6a0909

  Copy full SHA for a6a0909

• git notes merge: --commit should fail if underlying notes ref has moved

  Show description for 6cfd6a9
  

  jherland

  authored and

  gitster

  committed
  6cfd6a9

  Copy full SHA for 6cfd6a9

• git notes merge: List conflicting notes in notes merge commit message

  Show description for 443259c
  

  jherland

  authored and

  gitster

  committed
  443259c

  Copy full SHA for 443259c

• git notes merge: Manual conflict resolution, part 2/2

  Show description for 6abb365
  

  jherland

  authored and

  gitster

  committed
  6abb365

  Copy full SHA for 6abb365

• git notes merge: Manual conflict resolution, part 1/2

  Show description for 809f38c
  

  jherland

  authored and

  gitster

  committed
  809f38c

  Copy full SHA for 809f38c

• Documentation: Preliminary docs on 'git notes merge'

  Show description for 00f0306
  

  jherland

  authored and

  gitster

  committed
  00f0306

  Copy full SHA for 00f0306

• git notes merge: Add automatic conflict resolvers (ours, theirs, union)

  Show description for 3228e67
  

  jherland

  authored and

  gitster

  committed
  3228e67

  Copy full SHA for 3228e67

• git notes merge: Handle real, non-conflicting notes merges

  Show description for 2085b16
  

  jherland

  authored and

  gitster

  committed
  2085b16

  Copy full SHA for 2085b16

Pagination

Previous

Next