1. 30 6月, 2006 2 次提交
  2. 29 6月, 2006 6 次提交
  3. 28 6月, 2006 18 次提交
  4. 27 6月, 2006 8 次提交
  5. 26 6月, 2006 3 次提交
  6. 25 6月, 2006 3 次提交
    • J
      git-repack: Be careful when updating the same pack as an existing one. · 2ad47d61
      Junio C Hamano 提交于
      After a clone, packfiles are read-only by default and "mv" to
      replace the pack with a new one goes interactive, asking if the
      user wants to replace it.  If one is successfully moved and the
      other is not, the pack and its idx would become out-of-sync and
      corrupts the repository.
      
      Recovering is straightforward -- it is just the matter of
      finding the remaining .tmp-pack-* and make sure they are both
      moved -- but we should be extra careful not to do something so
      alarming to the users.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      2ad47d61
    • J
      diff --color: use $GIT_DIR/config · 801235c5
      Junio C Hamano 提交于
      This lets you use something like this in your $GIT_DIR/config
      file.
      
      	[diff]
      		color = auto
      
      	[diff.color]
      		new = blue
      		old = yellow
      		frag = reverse
      
      When diff.color is set to "auto", colored diff is enabled when
      the standard output is the terminal.  Other choices are "always",
      and "never".  Usual boolean true/false can also be used.
      
      The colormap entries can specify colors for the following slots:
      
      	plain	- lines that appear in both old and new file (context)
      	meta	- diff --git header and extended git diff headers
      	frag	- @@ -n,m +l,k @@ lines (hunk header)
      	old	- lines deleted from old file
      	new	- lines added to new file
      
      The following color names can be used:
      
      	normal, bold, dim, l, blink, reverse, reset,
      	black, red, green, yellow, blue, magenta, cyan,
      	white
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      801235c5
    • E
      rebase: allow --skip to work with --merge · d5e673b6
      Eric Wong 提交于
      Now that we control the merge base selection, we won't be forced
      into rolling things in that we wanted to skip beforehand.
      
      Also, add a test to ensure this all works as intended.
      Signed-off-by: NEric Wong <normalperson@yhbt.net>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      d5e673b6