Commits

Branch selector

 master

User selector

newren

Datepicker

All time

Commit History

Commits on Feb 21, 2019

• merge-options.txt: correct wording of --no-commit option

  Show description for 1ede45e
  

  newren

  authored and

  gitster

  committed
  1ede45e

  Copy full SHA for 1ede45e

Commits on Feb 14, 2019

• git-rebase.txt: update to reflect merge now implemented on sequencer

  Show description for 29d03f8
  

  newren

  authored and

  gitster

  committed
  29d03f8

  Copy full SHA for 29d03f8

Commits on Feb 8, 2019

• log,diff-tree: add --combined-all-paths option

  Show description for d76ce4f
  

  newren

  authored and

  gitster

  committed
  d76ce4f

  Copy full SHA for d76ce4f

Commits on Jan 10, 2019

• git-show-ref.txt: fix order of flags

  Show description for bd8d6f0
  

  newren

  authored and

  gitster

  committed
  bd8d6f0

  Copy full SHA for bd8d6f0

Commits on Jan 7, 2019

• rebase: implement --merge via the interactive machinery

  Show description for 68aa495
  

  newren

  authored and

  gitster

  committed
  68aa495

  Copy full SHA for 68aa495

Commits on Dec 28, 2018

• rebase: define linearization ordering and enforce it

  Show description for c91c944
  

  newren

  authored and

  gitster

  committed
  c91c944

  Copy full SHA for c91c944

• git-legacy-rebase: simplify unnecessary triply-nested if

  Show description for 7b76ac6
  

  newren

  authored and

  gitster

  committed
  7b76ac6

  Copy full SHA for 7b76ac6

• git-rebase, sequencer: extend --quiet option for the interactive machinery

  Show description for 899b49c
  

  newren

  authored and

  gitster

  committed
  899b49c

  Copy full SHA for 899b49c

• am, rebase--merge: do not overlook --skip'ed commits with post-rewrite

  Show description for 45339f7
  

  newren

  authored and

  gitster

  committed
  45339f7

  Copy full SHA for 45339f7

• t5407: add a test demonstrating how interactive handles --skip differently

  Show description for 5400677
  

  newren

  authored and

  gitster

  committed
  5400677

  Copy full SHA for 5400677

• rebase: fix incompatible options error message

  Show description for 72ee673
  

  newren

  authored and

  gitster

  committed
  72ee673

  Copy full SHA for 72ee673

• rebase: make builtin and legacy script error messages the same

  Show description for c913c59
  

  newren

  authored and

  gitster

  committed
  c913c59

  Copy full SHA for c913c59

Commits on Dec 9, 2018

• git-rebase.txt: update note about directory rename detection and am

  Show description for a8f5a59
  

  newren

  authored and

  gitster

  committed
  a8f5a59

  Copy full SHA for a8f5a59

Commits on Nov 17, 2018

• fast-export: add a --show-original-ids option to show original names

  Show description for a965bb3
  

  newren

  authored and

  gitster

  committed
  a965bb3

  Copy full SHA for a965bb3

• fast-import: remove unmaintained duplicate documentation

  Show description for 25dd3e4
  

  newren

  authored and

  gitster

  committed
  25dd3e4

  Copy full SHA for 25dd3e4

• fast-export: add --reference-excluded-parents option

  Show description for 530ca19
  

  newren

  authored and

  gitster

  committed
  530ca19

  Copy full SHA for 530ca19

• fast-export: ensure we export requested refs

  Show description for fdf31b6
  

  newren

  authored and

  gitster

  committed
  fdf31b6

  Copy full SHA for fdf31b6

• fast-export: when using paths, avoid corrupt stream with non-existent mark

  Show description for cd13762
  

  newren

  authored and

  gitster

  committed
  cd13762

  Copy full SHA for cd13762

• fast-export: move commit rewriting logic into a function for reuse

  Show description for f129c42
  

  newren

  authored and

  gitster

  committed
  f129c42

  Copy full SHA for f129c42

• fast-export: avoid dying when filtering by paths and old tags exist

  Show description for 1f30c90
  

  newren

  authored and

  gitster

  committed
  1f30c90

  Copy full SHA for 1f30c90

• fast-export: use value from correct enum

  Show description for b93b81e
  

  newren

  authored and

  gitster

  committed
  b93b81e

  Copy full SHA for b93b81e

• git-fast-export.txt: clarify misleading documentation about rev-list args

  Show description for 4532be7
  

  newren

  authored and

  gitster

  committed
  4532be7

  Copy full SHA for 4532be7

• git-fast-import.txt: fix documentation for --quiet option

  Show description for f55c979
  

  newren

  authored and

  gitster

  committed
  f55c979

  Copy full SHA for f55c979

• fast-export: convert sha1 to oid

  Show description for 843b9e6
  

  newren

  authored and

  gitster

  committed
  843b9e6

  Copy full SHA for 843b9e6

Commits on Nov 8, 2018

• t6036, t6043: increase code coverage for file collision handling

  Show description for b8cd1bb
  

  newren

  authored and

  gitster

  committed
  b8cd1bb

  Copy full SHA for b8cd1bb

• merge-recursive: improve rename/rename(1to2)/add[/add] handling

  Show description for 48c9cb9
  

  newren

  authored and

  gitster

  committed
  48c9cb9

  Copy full SHA for 48c9cb9

• merge-recursive: use handle_file_collision for add/add conflicts

  Show description for dcf2815
  

  newren

  authored and

  gitster

  committed
  dcf2815

  Copy full SHA for dcf2815

• merge-recursive: improve handling for rename/rename(2to1) conflicts

  Show description for bbafc9c
  

  newren

  authored and

  gitster

  committed
  bbafc9c

  Copy full SHA for bbafc9c

• merge-recursive: fix rename/add conflict handling

  Show description for 7f86716
  

  newren

  authored and

  gitster

  committed
  7f86716

  Copy full SHA for 7f86716

• merge-recursive: new function for better colliding conflict resolutions

  Show description for 37b65ce
  

  newren

  authored and

  gitster

  committed
  37b65ce

  Copy full SHA for 37b65ce

• merge-recursive: increase marker length with depth of recursion

  Show description for b2a7942
  

  newren

  authored and

  gitster

  committed
  b2a7942

  Copy full SHA for b2a7942

• t6036, t6042: testcases for rename collision of already conflicting files

  Show description for b28eeb3
  

  newren

  authored and

  gitster

  committed
  b28eeb3

  Copy full SHA for b28eeb3

• t6042: add tests for consistency in file collision conflict handling

  Show description for bb05c9f
  

  newren

  authored and

  gitster

  committed
  bb05c9f

  Copy full SHA for bb05c9f

Commits on Oct 22, 2018

• fsck: move fsck_head_link() to get_default_heads() to avoid some globals

  Show description for a8c754d
  

  newren

  authored and

  gitster

  committed
  a8c754d

  Copy full SHA for a8c754d

Commits on Oct 18, 2018

• merge-recursive: avoid showing conflicts with merge branch before HEAD

  Show description for 4f44545
  

  newren

  authored and

  gitster

  committed
  4f44545

  Copy full SHA for 4f44545

Pagination

Previous

Next