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
Juni
o
C Hamano
Update draf
t
rel
e
ase notes 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
Git 1
.
8
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Hamano
Me
r
ge branch 'ss/
h
el
p
-htmlpath-config-doc' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
Hamano
M
e
rge
branch 'n
d
/attr-de
b
ug-fix' into m
a
int
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
Hamano
M
e
r
g
e
branch '
d
s
/
comp
l
etion-silence-in-tree-pat
h
-
p
robe
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
ano
Merge branch 'jn/m
a
int
-
trim-vim-contrib
'
into maint
commit
|
commitdiff
|
tree
2013-01-28
J
u
n
i
o C Hamano
Merge branch 'pe/doc
-
email-env-is
-
trumped-by-config
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch 'mk/complete-tc
s
h'
i
n
t
o maint
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio C Haman
o
Merge branch 'a
p
/statu
s
-i
g
nore
d
-in-ignored-direct
o
ry
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
Haman
o
Merge
b
ranch 'er/
s
top-recommending-pa
r
secvs' into main
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
e
rge branch 'mh/ceiling' int
o
maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Me
r
ge bra
n
ch
'tb/t0050-maint'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge bra
n
ch 'd
l
/am-hg-
l
oc
a
le'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge bran
c
h 'jc/h
e
lp'
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C Hamano
Merge branch '
b
c/fix-array-syntax-for-3
.
0-in-comple
t
ion
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matthieu Moy
add: w
a
rn when -u o
r
-
A
is used wit
h
out
pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
gi
t
-remot
e
-testpy: fix path hashing
on Python 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
merge
t
o
o
l--l
i
b: do
n
't call
"
exit"
in setup_to
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mer
g
e
t
ool--lib: i
m
prove show_tool_help()
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
mergetools/vim:
r
emove redundant diff com
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p
4
:
i
n
t
roduce gitConfigBool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ck
o
ff
git p4: avoid
s
h
e
ll when calling git config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wy
c
kof
f
git p4: avoid shell when invok
i
ng git conf
i
g
-
-
ge
t
-al
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yckoff
git p
4
:
a
v
oid shell when invoki
n
g
git
r
ev-l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
et
e
Wyckoff
git
p
4: avoid shel
l
w
h
en mapping
u
ser
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4: dis
a
ble r
e
a
d
-only
a
ttribut
e
b
e
f
o
re
d
eleting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
gi
t
p4 test: use test_chmod
for cyg
w
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: cygwin p4 client doe
s
not mark read-only
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
f
f
git p4 tes
t
: avoi
d
wildcard * in win
d
ows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
git p4
test:
u
se LineEnd
u
n
ix i
n
w
i
ndo
w
s test
s
too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
Wyckoff
g
it p4 te
s
t
: newline han
d
li
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yc
k
off
git p4: s
c
rub c
r
lf for
u
tf16
f
i
les on windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: remove un
r
eachable
w
ind
o
ws \r\n conversion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test: translate windows paths for cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
i
t p
4
test: start p4d inside its db dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4
t
est:
use
c
lient_
v
iew
in t98
0
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test: avoid loop in c
l
ient_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
Pete W
y
c
k
off
git p4 test: use
c
l
ient_view
to build t
h
e in
i
tia
l
c
lient
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yck
o
ff
gi
t
p4: generate better e
r
ror message for bad de
p
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
cko
f
f
g
i
t p4: rem
o
ve unused imp
o
rt
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4:
t
emp branch
name s
h
ould use / even on windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Junio C Hama
n
o
Merg
e
branch
'jk/maint-
g
c-auto-
a
f
ter-fetch' in
t
o
jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Jeff King
fetch-pack:
a
void repeatedly re-scanning pac
k
directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Jeff King
fe
t
ch: run gc --au
t
o
after fetchin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Sven
S
trickroth
me
r
get
o
o
l
s
: suppo
r
t To
r
toiseGitM
e
r
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Brandon Casey
git-p4
.
py: suppo
r
t
Py
t
hon 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Brandon C
a
se
y
git-
p
4
.
py: support
Python 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-26
Jeff King
lo
g
ms
g
_reenc
o
d
e: l
a
zily
l
oad missing comm
i
t b
u
ffers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-26
Jeff K
i
ng
logmsg_reenc
o
de: never
re
t
urn
N
ULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-26
J
eff King
co
m
mi
t
:
d
rop useles
s
xstr
d
up of
commit m
e
ssa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
Merge br
a
nch 'for-ju
n
io' o
f
git://bogomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2013-01-25
Junio
C
Hamano
Update draft release n
o
t
es to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Junio C H
a
mano
Merge branch 'nd/ret
i
re-fnm
a
tch'
commit
|
commitdiff
|
tree
2013-01-25
J
uni
o
C
H
ama
n
o
Mer
g
e
b
ranc
h
'jc/d
o
c-maintainer'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
howto/maintain: document
"#
#
# match
n
ex
t
" conve
n
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pi
n
g
g
it-difft
o
ol: use git-mergetool--lib
for "--
t
ool-help"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
Keeping
git-mergetool: don't ha
r
dcode 'merge
t
ool
'
in sh
o
w_
t
ool_help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-mergetool: remove
redunda
n
t
a
s
signment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-m
e
rg
e
to
o
l
:
move show_
t
ool_help to mergetool
-
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Jonat
h
an
Nieder
i
d
ent: do
not
d
rop
use
r
name
when reading from /etc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
push: fini
s
hing touches to e
x
plain REJECT_AL
R
EA
D
Y_EXISTS
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git-remote-
t
estpy: call print as a function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
emote
-
te
s
tpy
:
don't do unbuff
e
red text I/O
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepin
g
git-
r
emote-testpy: hash bytes explicitly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
svn-f
e
:
allow s
v
nrdump_sim
.
py to
r
u
n
w
i
th Python 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_
r
emote_helpers: us
e
2t
o
3 if building with Python 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_remote_helpers: force
r
e
b
uil
d
if
pytho
n
version
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
Haman
o
t9902:
prote
c
t 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
H
amano
push:
introduce REJECT
_
FETCH_
F
IRST
a
nd REJECT_NEEDS_FORCE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Jun
i
o
C
Hamano
push: further simplif
y
the
l
ogic t
o
assign rej
e
ction
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Junio C
H
aman
o
push: further c
l
ean up fields of "struct ref"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Alexey Shumkin
t7102 (reset): don't ha
r
dc
o
de SHA-1 in expected outputs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-c
v
simport
.
txt: cv
s
ps-2 is deprecated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Ju
n
io C Hamano
Merge b
r
an
c
h
'as/p
r
e-p
u
sh-hook'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Haman
o
M
e
r
g
e
b
ra
n
ch 'ch/a
d
d-auto-submitted-in-sample-pos
t
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
Junio C H
a
mano
Mer
g
e branch 'as
/
chec
k
-ig
n
ore'
commit
|
commitdiff
|
tree
2013-01-24
Junio
C Hamano
Merge br
a
n
ch 'rs/clarify-entry-cmp-
s
slice'
commit
|
commitdiff
|
tree
2013-01-24
Jun
i
o C Hamano
Merge branch 'j
k
/
s
upp
r
es
s
-clang-warning
'
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio C Hamano
Merge bran
c
h 'cr/push-
f
orc
e
-tag-update'
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio
C
Hamano
Merge br
a
n
c
h
'mh/
i
map-send-shrinkage'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Merge branch '
m
o/cvs-serve
r
-upd
a
t
es
'
commit
|
commitdiff
|
tree
2013-01-24
J
unio C Hamano
M
e
rge bra
n
ch 'jc/mak
e
file-perl-python
-
p
ath-doc'
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
r
e
fl
o
g: use parse_conf
i
g
_key
i
n con
f
ig callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff
King
help:
u
s
e
par
s
e_
c
onfig_key for
m
an con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
J
eff King
submodule: simpli
f
y memory ha
n
dling in co
n
fig parsi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
sub
m
odule: use
p
a
r
s
e
_
c
o
nfig_key whe
n
pars
i
ng config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jef
f
Ki
n
g
userdiff: drop
p
arse_driver fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
J
e
ff King
convert some config call
b
acks to parse_con
f
ig_key
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jef
f
Ki
n
g
archive-tar: use parse_
c
onfig_key when parsing config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jef
f
King
c
onfig: add helper
f
u
nction for
p
a
r
sing key names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Juni
o
C Ham
a
n
o
M
e
rge git://ozlab
s
.
org/~pa
u
l
u
s
/gitk
commit
|
commitdiff
|
tree
2013-01-22
Junio
C Ham
a
no
Merge
b
r
a
n
ch 'j
c
/merge-blobs'
commit
|
commitdiff
|
tree
2013-01-22
Ram
s
ay Jones
Make
f
ile
:
Re
p
lace
m
erge-file
.
h with merge-b
l
obs
.
h in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Update dr
a
f
t release notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
J
u
nio C
H
a
man
o
Merge
b
r
a
nch
'
m
z/reset-m
i
sc'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
M
erge
branch 'nd/f
i
x-directory-attrs-of
f
-
by-one'
commit
|
commitdiff
|
tree
2013-01-22
Robin Rosenberg
Ena
b
le mini
m
al stat chec
k
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Merge
b
ranch 'pw/p4
-
branch-fixes'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Me
r
ge branch 'mh/
r
e
m
ote-hg-mode-bits-fix'
commit
|
commitdiff
|
tree
next