]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:06:55 +0000 (14:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:06:55 +0000 (14:06 -0700)
* maint:
  diff.c: diff.renamelimit => diff.renameLimit in message
  wt-status: fix possible use of uninitialized variable
  fast-import: clarify "inline" logic in file_change_m
  run-command: always set failed_errno in start_command
  transport: drop "int cmp = cmp" hack
  drop some obsolete "x = x" compiler warning hacks
  fast-import: use pointer-to-pointer to keep list tail

1  2 
transport.c
wt-status.c

diff --cc transport.c
Simple merge
diff --cc wt-status.c
Simple merge