repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-remote-mediawiki: use toplevel's Makefile
2013-01-28
Ju
n
io C
H
amano
Sync wit
h
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
Junio C Hamano
Merge branch 'ss/help
-
htmlpa
t
h
-config-d
o
c' into maint
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C
H
a
m
ano
M
er
g
e branch '
n
d/attr-debug-fix'
into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
Hamano
Merge bra
n
ch 'ds/c
o
m
pletion-s
i
lence
-
in
-
tree-path-pro
b
e
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Hama
n
o
Mer
g
e branch
'jn/maint-tr
i
m-vim-contr
i
b'
i
nto maint
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C Hamano
Merge br
a
n
c
h
'pe/doc-e
m
ail-e
n
v-i
s
-trumpe
d
-by-conf
i
g
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
u
n
i
o C Ha
m
ano
Merge br
a
nch 'mk/complete-tcsh' into
m
aint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge
b
ra
n
ch 'a
p
/st
a
tu
s
-ignored-i
n
-ign
o
red
-
directory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Me
r
ge branch 'er/stop-re
c
o
mmending-parsecvs' into ma
i
nt
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio
C
Hamano
Merge b
r
anch 'mh
/
c
eiling' into maint
commit
|
commitdiff
|
tree
2013-01-28
J
unio C
H
amano
M
e
rge branch '
t
b/t0050
-
maint'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hama
n
o
Merge branch 'dl/am-hg-l
o
cale'
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio
C Hamano
Merge br
a
nch 'jc/hel
p
'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Mer
g
e branch 'bc/
f
ix-array-syntax-for-3
.
0-in-c
o
mpletion
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matthieu Mo
y
a
d
d: 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
git-rem
o
t
e
-testpy: fix p
a
th hashin
g
on Python 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
merge
t
ool--li
b
: don't call "exit" in setup_tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
ergetool
-
-li
b
: improve
s
ho
w
_
t
ool_h
e
lp() output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergeto
o
ls/
v
im: remo
v
e red
u
ndan
t
diff
c
ommand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: introduc
e
gitCo
n
fig
B
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yc
k
off
gi
t
p4:
avo
i
d
shell
w
hen calling git config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te
W
yc
k
off
git p4
:
avoid shell whe
n
invokin
g
g
i
t config --get-all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
gi
t
p4: avoid shell when i
n
vokin
g
git r
e
v-lis
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
koff
g
it p4: avoid shell
when m
a
pping us
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yckoff
git p4
:
dis
a
bl
e
read-only attribute bef
o
re dele
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyckoff
git
p
4
test: use
t
e
s
t
_
chmod for cygwi
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
git p4: cygwin p4 clien
t
does not mark read-only
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
git p4 test:
a
void wildc
a
rd * in windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yckoff
git p
4
test:
u
se LineEnd
u
nix in
w
indows tes
t
s too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test: newline ha
n
dling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
off
git
p
4: scrub c
r
l
f
f
o
r u
t
f16 fi
l
e
s
on
w
indo
w
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
git p4:
r
e
move unreac
h
able windows \r\n con
v
ersio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
g
i
t
p4 test
:
t
r
a
nslate windows paths for cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete W
y
cko
f
f
git p4
test: start p
4
d inside its db
d
ir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
of
f
git p4
test:
u
se client_vi
e
w
in
t9806
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
W
y
c
koff
git p4 test: avoi
d
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
Pete Wyckoff
git p4
test: use
c
l
ien
t
_v
i
e
w
t
o build the initial cli
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te W
y
ckoff
git p4: generat
e
better error message for
ba
d
depot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
git p4: remove unu
s
ed i
m
ports
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wyckoff
gi
t
p4:
t
e
m
p bra
n
ch n
a
me
should us
e
/ even on windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Junio C
Hamano
Merge branch '
j
k
/
main
t
-gc-auto-a
f
ter-fetch' into jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Jeff King
fetch-
p
ack: a
v
o
id repeat
e
dly re-sca
n
ning p
a
ck directo
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Jef
f
King
fetch: run gc
-
-auto
a
fter fetchin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
S
ven St
r
ickroth
mergetools: supp
o
rt TortoiseGitMer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Brandon Casey
git-p4
.
py: support Python
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Brandon Casey
gi
t
-p4
.
py: su
p
port P
y
thon
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
J
e
f
f
King
l
og
m
s
g
_reen
c
ode:
lazily load missing commit bu
f
fers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff King
logm
s
g_reencode: never
r
et
u
rn NULL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff King
commit
:
drop use
l
ess x
s
trdup of comm
i
t
m
essage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hama
n
o
Merge
bra
n
c
h
'for-j
u
nio' of gi
t
://bogomip
s
.
org/
g
it
-
svn
commit
|
commitdiff
|
tree
2013-01-25
Junio
C
H
a
m
a
no
Update
draft release notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
M
e
r
ge
branch 'nd/
r
et
i
re-
f
nmat
c
h
'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
Me
r
ge bran
c
h 'jc/
d
oc-maintainer'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hama
n
o
h
o
wto/maintain: document "#
#
# ma
t
ch next" con
v
ention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-di
f
ftool: use
g
it-mergetool--l
i
b for "--tool-he
l
p"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: don
'
t
hardcode 'mergetool'
i
n show
_
too
l
_h
e
lp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-mergetool: re
m
ove red
u
ndant a
s
signment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
it-mergetool: move show_t
o
ol
_
help
to mergetool--lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
nathan
N
ieder
ident: do
n
ot drop userna
m
e
w
h
e
n reading from /etc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C
Hamano
p
ush: fini
s
hing touches to expla
i
n REJECT_ALREADY_EXISTS
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-remote-te
s
t
p
y: call pr
i
nt
as a function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testpy: don'
t
do unbuffered text I/O
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-tes
t
p
y:
hash bytes explicit
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn
-
f
e
: allow svnrdu
m
p
_sim
.
p
y to run with Python 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
p
i
n
g
git_remo
t
e_help
e
rs: use 2to3
i
f building with Pyth
o
n 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_r
e
mo
t
e_he
l
pers: force reb
u
ild if python version
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C
Ham
a
no
t9902:
p
rotect test
f
rom stray
b
uild
a
rtifacts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
push: introduc
e
REJECT_FETCH_FIRST
and REJECT
_
N
EED
S
_FORCE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
pu
s
h:
f
ur
t
her simplify the lo
g
ic to assign rejection
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
push: fur
t
h
e
r c
l
ean
up fields
o
f "st
r
uct ref"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
A
l
exey Sh
u
m
kin
t7102 (reset
)
: don't hardcode SHA
-
1 in e
x
p
e
cted ou
t
p
u
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
Keeping
git-cvsimport
.
t
xt: cvsps-2 is deprecated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
J
u
n
i
o
C
Ha
m
a
no
Me
r
ge bra
n
ch 'as/pre-pu
s
h-hook
'
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio C Haman
o
Merge branch
'
c
h
/add-auto-submitted-in-sa
m
ple-post
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hamano
M
e
rge
b
ranch 'as/check-ignor
e
'
commit
|
commitdiff
|
tree
2013-01-24
Jun
i
o C
Haman
o
Merge b
r
a
n
ch
'rs/c
l
arify-entry
-
c
mp-sslice'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
H
amano
Mer
g
e branch 'jk/suppress-c
l
ang-warning'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hama
n
o
Merge branch 'cr/push-force-tag-upd
a
te'
commit
|
commitdiff
|
tree
2013-01-24
Ju
n
i
o
C
H
a
mano
Merge b
r
anch 'm
h
/imap-send-shrinkage'
commit
|
commitdiff
|
tree
2013-01-24
J
u
ni
o
C
Haman
o
M
e
r
g
e branc
h
'mo/c
v
s-se
r
ver-upd
a
t
e
s'
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio C
Hamano
Mer
g
e
br
a
n
c
h
'jc/
m
akefile-p
e
rl
-
p
y
t
h
o
n
-
path-doc'
commit
|
commitdiff
|
tree
2013-01-23
Je
f
f King
reflo
g
: use parse_
c
o
nfig_key
i
n config
c
a
llb
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
e
ff King
h
elp: use parse
_
config_key for ma
n
config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
s
u
bmodu
l
e
: simplify memory handling in config parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
s
ubmo
d
ule: use
p
ars
e
_con
f
ig_key w
h
en pa
r
sing config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
e
f
f King
user
d
iff: drop parse_driver function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff
K
ing
convert some config callbacks
t
o p
a
r
s
e_config
_
k
ey
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jef
f
King
a
rchive-tar: use parse_config_key w
h
en parsing
c
o
nfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jef
f
King
c
o
nfig: ad
d
helper functio
n
fo
r
pa
r
sing key names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Junio C Haman
o
Me
r
ge git://ozlabs
.
o
r
g/~paulus/gi
t
k
commit
|
commitdiff
|
tree
2013-01-22
Ju
n
io C Hama
n
o
Merge branch 'jc/merg
e
-blo
b
s'
commit
|
commitdiff
|
tree
2013-01-22
R
a
ms
a
y Jones
Makefile
:
Repl
a
ce
m
erge
-
fil
e
.
h
with merge-blobs
.
h
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Ha
m
ano
Upda
t
e dra
f
t re
l
ease notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Ju
n
io
C
H
amano
Me
r
ge bra
n
ch 'mz/reset-
m
isc'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Haman
o
Mer
g
e branch '
n
d/fix-
d
irectory-attr
s
-off-
b
y-one'
commit
|
commitdiff
|
tree
2013-01-22
Robin
Rosenberg
E
na
b
l
e
minima
l
stat c
h
ecking
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Junio C
H
amano
M
e
rge branch 'pw/p
4
-br
a
n
c
h-fixes'
commit
|
commitdiff
|
tree
2013-01-22
J
unio C
H
amano
M
er
g
e bran
c
h
'mh/remot
e
-hg
-
mode-bi
t
s-fix'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Ha
m
ano
Me
r
ge branch 'fc/remote-hg-fixup-url
'
commit
|
commitdiff
|
tree
next