delta/git.git, branch nd/daemon-log-sock-errors github.com: git/git.git daemon: log errors if we could not use some sockets 2011-10-03T22:38:07+00:00 Nguyễn Thái Ngọc Duy pclouds@gmail.com 2011-10-03T19:13:28+00:00 089d82e8a6d6443e10052f04c469e9e70784eb93 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.7.6 2011-06-26T19:41:16+00:00 Junio C Hamano gitster@pobox.com 2011-06-26T19:41:16+00:00 f696543dad6c7ba27b0c4fab167a5687263a9ba0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint' 2011-06-26T19:09:11+00:00 Junio C Hamano gitster@pobox.com 2011-06-26T19:09:11+00:00 568d44641bc8e754157cf551e58154106d3532ae * maint: completion: replace core.abbrevguard to core.abbrev 
* maint:
  completion: replace core.abbrevguard to core.abbrev
Merge branch 'maint-1.7.4' into maint 2011-06-24T16:40:02+00:00 Junio C Hamano gitster@pobox.com 2011-06-24T16:40:02+00:00 99ac63b092f592b7181f94b6479f3a24dbfc8fdb * maint-1.7.4: completion: replace core.abbrevguard to core.abbrev 
* maint-1.7.4:
  completion: replace core.abbrevguard to core.abbrev
completion: replace core.abbrevguard to core.abbrev 2011-06-24T16:35:44+00:00 Namhyung Kim namhyung@gmail.com 2011-06-24T06:17:42+00:00 cdb791f61d71db24fa54363ff6d4b42a46ebbdf1 The core.abbrevguard config variable had removed and now core.abbrev has been used instead. Teach it. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
The core.abbrevguard config variable had removed and
now core.abbrev has been used instead. Teach it.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.7.6-rc3 2011-06-22T23:13:16+00:00 Junio C Hamano gitster@pobox.com 2011-06-22T23:13:16+00:00 7af4fc9cf3e3538a9bfb8b14feeacdeb7f6db7d5 Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint' 2011-06-22T21:01:18+00:00 Junio C Hamano gitster@pobox.com 2011-06-22T21:01:18+00:00 def98035d00c57bb8723e7859366536504eb56aa * maint: Documentation: git diff --check respects core.whitespace 
* maint:
  Documentation: git diff --check respects core.whitespace
Documentation: git diff --check respects core.whitespace 2011-06-22T18:40:32+00:00 Christof Krüger git@christof-krueger.de 2011-06-22T15:33:02+00:00 4f8303905eafaa04fd08a20a08a81436aea2d4b9 Fix documentation on "git diff --check" by adopting the description from "git apply --whitespace". Signed-off-by: Christof Krüger <git@christof-krueger.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Fix documentation on "git diff --check" by adopting the description from
"git apply --whitespace".

Signed-off-by: Christof Krüger <git@christof-krueger.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint' 2011-06-21T21:56:59+00:00 Junio C Hamano gitster@pobox.com 2011-06-21T21:56:59+00:00 2765233c64c35eb43a8b46c377fb8b464469221f * maint: gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled 
* maint:
  gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled 2011-06-21T21:07:35+00:00 Jakub Narebski jnareb@gmail.com 2011-06-21T06:41:16+00:00 a598ded1e2e9cc9f4ce93d091808b475839e6867 Both 'pickaxe' (searching changes) and 'grep' (searching files) require basic 'search' feature to be enabled to work. Enabling e.g. only 'pickaxe' won't work. Add a comment about this. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Both 'pickaxe' (searching changes) and 'grep' (searching files)
require basic 'search' feature to be enabled to work.  Enabling
e.g. only 'pickaxe' won't work.

Add a comment about this.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>