repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mp/complete-paths'
2013-01-28
Junio C Hamano
Update draft release note
s
to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Sync with 1
.
8
.
1
.
2
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
G
it 1
.
8
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
Ham
a
no
Merge branch 'ss/help-htmlpath-config-doc'
int
o
maint
commit
|
commitdiff
|
tree
2013-01-28
J
u
n
i
o
C Hamano
Merge branch '
n
d/attr-debug-
f
ix'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2013-01-28
J
u
n
io C H
a
mano
Merge
b
ranch
'
d
s/completion-silence-in-tree-path-p
r
obe
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C
Hamano
Merg
e
b
ranch 'jn/
m
aint-trim
-
vim-contrib'
into m
a
int
commit
|
commitdiff
|
tree
2013-01-28
J
u
ni
o
C Ha
m
ano
Merge
b
ranch 'p
e
/doc-e
m
ail-env-is-trumped-
b
y-config
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Hamano
M
e
rge branch '
m
k/complete-tcsh' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ham
a
no
Merge branch 'ap/status-
i
g
n
ore
d
-in-ignored-directory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch
'
er/s
t
op-recommendi
n
g-par
s
ecvs' i
n
to maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
ano
Merge branc
h
'mh/ceiling' i
n
t
o
maint
commit
|
commitdiff
|
tree
2013-01-28
Junio
C H
a
m
a
no
Merge branch
'
tb/t0050-maint'
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C Hamano
Merge bran
c
h 'dl/
a
m
-hg-l
o
c
a
le'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Mer
g
e branch 'jc
/
help'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch 'bc/fix-array-syntax
-
for-3
.
0
-in-completio
n
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matthie
u
Moy
add: warn when -u
o
r -A
is used without pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
it-re
m
ot
e
-testpy: fi
x
path hashin
g
o
n
Python
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mer
g
etool--lib:
d
on't
call
"
exit"
in setup_tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
merge
t
oo
l
-
-lib: improve show_too
l
_
help() o
u
t
p
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
mergetools
/
v
i
m: remove re
d
undant dif
f
comma
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
it p4
:
introduce gi
t
ConfigB
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: avo
i
d shell w
h
en calling g
i
t config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
i
t
p4: avoid sh
e
ll when invoking
git config --get-all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
y
c
koff
git p4: avoid shell wh
e
n i
n
voking git
rev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: avoid
s
hell w
h
en ma
p
ping users
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e
Wyck
o
f
f
git
p4: disabl
e
read-o
n
ly attribute before del
e
ting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
ff
git p4
test: use
test_c
h
mod
for cy
g
w
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4:
cygwin p4 cl
i
ent
d
oes
n
ot mark read-
o
nly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyck
o
ff
git p4
test
:
avoi
d
w
ildcard * in win
d
ows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e W
y
ckoff
git p4 test: use LineEnd unix in win
d
ows tests too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te
Wyc
k
off
g
i
t
p
4 tes
t
: newline h
a
ndling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git
p
4: scrub crlf fo
r
utf16 files
on windo
w
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
c
k
off
gi
t
p4: remo
v
e unreachable
w
indows \r\n conversion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test: translate window
s
paths for
cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
git p
4
test: star
t
p4d ins
i
de
i
ts db dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p4 t
e
st:
u
s
e client_vie
w
in t9806
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4 test: a
v
oid loop in client_view
Based-on-patch-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete Wyckoff
gi
t
p4 test: use client_view to build the
i
nitial clie
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
t
e Wyck
o
ff
git p4:
g
enerate bet
t
er error messa
g
e for bad depot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yckof
f
git p4: remove unus
e
d
imports
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: temp bran
c
h
name
should
u
s
e
/ even on
w
indows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Juni
o
C Hamano
Me
r
ge br
a
nch 'j
k
/
m
ai
n
t-gc-
a
u
t
o
-
after-fetch' into jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Jeff King
f
etch-pack: avoid repeatedly re-scanning pack directo
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
J
e
ff King
fetch: run gc --auto after fetching
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Sven Strickroth
merget
o
ols
:
support Tort
o
is
e
GitMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
B
randon
C
ase
y
git-p
4
.
p
y
: support Pyt
h
on 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Bran
d
o
n Casey
git-p4
.
py: suppor
t
Python 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff King
logmsg_reencode: lazily load
missing comm
i
t buffers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff King
logmsg_reenc
o
de
:
never r
e
tur
n
N
UL
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff Ki
n
g
commit: drop
u
s
e
less xs
t
rdup
o
f
commit message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Juni
o
C
Hamano
Merge branc
h
'for-junio
'
of git://bogomi
p
s
.
org/git-sv
n
commit
|
commitdiff
|
tree
2013-01-25
Junio C
H
amano
Update draf
t
r
eleas
e
n
o
te
s
to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Ju
n
io C Hamano
M
erge bra
n
ch
'
nd/
r
etire-fnma
t
c
h'
commit
|
commitdiff
|
tree
2013-01-25
J
u
n
io C Hamano
Merge branch 'jc/do
c
-ma
i
ntainer'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
howto/ma
i
ntain: docum
e
nt
"
#
## match next" c
o
nvention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-difftool: use git-mergetool--lib fo
r
"-
-
tool-he
l
p"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
m
ergetool: do
n
't hardcode '
m
erg
e
tool
'
in
show_tool_help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git
-
merg
e
tool: remo
v
e
r
edundant assignment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-
m
er
g
etool: move
show_tool_he
l
p
to me
r
g
e
tool--lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
natha
n
Nieder
ident: do not dro
p
userna
m
e
w
hen
r
e
ading
f
rom /
e
tc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio
C Hamano
push: f
i
n
ishing tou
c
h
e
s to explain REJE
C
T
_ALR
E
ADY_EXIS
T
S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-remot
e
-test
p
y: cal
l
p
rint as a function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
remote-te
s
t
p
y: don't do unbuffered
t
ext I
/
O
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-r
e
mote-te
s
tpy: hash bytes explicitly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
s
vn-fe: a
l
low sv
n
rdu
m
p_sim
.
p
y
to run wi
t
h Py
t
hon 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_r
e
mote_h
e
lpers: u
s
e 2to3
i
f
build
i
ng with Python 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git_r
e
m
ote_helpers: force rebu
i
ld if python
v
ersion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
t990
2
: protect test
from
s
t
r
ay
b
uild artifacts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
Hamano
push: in
t
roduce REJECT_FETC
H
_FIRST and REJECT_N
E
EDS_FOR
C
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
Ha
m
ano
push: furt
h
er simplify
the logic to assi
g
n rejectio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
push: further c
l
ea
n
up fields of "struct re
f
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Ale
x
ey Shumkin
t7102 (
r
eset):
don't
hard
c
ode SHA-1 in
expected
outpu
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimpo
r
t
.
txt: cvs
p
s-2 is deprecated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C H
a
mano
Merge bran
c
h 'as/pre-push-hook'
commit
|
commitdiff
|
tree
2013-01-24
Junio C H
a
mano
Merge branch 'ch/add-auto-submitted-in-sa
m
ple-post
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Merge bra
n
ch 'as/check-ignore
'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Haman
o
Merge bran
c
h
'rs/clarify
-
en
t
ry-cmp-ssl
i
ce'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Merge branch '
j
k/suppress-cla
n
g-warni
n
g'
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C H
a
mano
M
e
r
ge
branch 'cr/push-force-t
a
g-update'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Merge b
r
anch 'mh/ima
p
-se
n
d-shr
i
nkag
e
'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
H
a
mano
Merg
e
br
a
nch 'mo
/
cv
s
-ser
v
er-updates'
commit
|
commitdiff
|
tree
2013-01-24
Junio C H
a
m
ano
Merge branch
'
jc/makef
i
le-perl-python-p
a
th-d
o
c'
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
r
eflog: use
pa
r
s
e_config_key in conf
i
g callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
e
f
f King
h
e
l
p:
use
p
a
r
se_conf
i
g_key for man confi
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff K
i
ng
submodule: simplif
y
memor
y
h
a
ndling
in config
pars
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
eff King
submodule: use p
a
rse_co
n
f
i
g_key
w
he
n
parsing co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff Ki
n
g
u
serdiff: d
r
op
p
arse_driver function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
c
onvert some config callbacks to
p
arse_config_key
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Je
f
f King
archiv
e
-
t
ar: use parse_con
f
ig_k
e
y
when pa
r
sing config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
eff K
i
ng
co
n
fig: add helper
functio
n
for parsing
key names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Junio C H
a
mano
Merge git://
o
z
labs
.
org/
~
p
a
u
l
us
/
g
i
tk
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Merge bran
c
h 'jc/merge-blobs'
commit
|
commitdiff
|
tree
2013-01-22
Ramsay Jones
M
akefile:
R
e
p
lace merg
e
-file
.
h wit
h
mer
g
e-blobs
.
h i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Junio
C Haman
o
Update dr
a
ft re
l
ease notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Merg
e
branch 'mz/rese
t
-misc'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hama
n
o
Merge br
a
n
ch 'n
d
/fix-dir
e
ctory-a
t
t
r
s-o
f
f-by-one'
commit
|
commitdiff
|
tree
2013-01-22
R
o
b
in Rosenberg
Enable mini
m
a
l
s
tat checking
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Ju
n
i
o
C Hamano
Merge
b
r
anch 'pw/p4-branch-fixes'
commit
|
commitdiff
|
tree
2013-01-22
Junio C
H
aman
o
M
erge branch 'mh/r
e
mo
t
e
-
h
g
-mode-bits-fix'
commit
|
commitdiff
|
tree
next