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
U
p
dat
e
draft release notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
J
unio
C H
a
mano
S
ync 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
Ju
n
io
C
H
a
mano
Merge branch '
s
s
/
help-html
p
at
h
-config-doc' i
n
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ham
a
no
Merge
b
ranch 'nd/attr-debug-fix' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Haman
o
M
erge branch '
d
s
/completion
-
s
ilen
c
e-in-tre
e
-path-pro
b
e
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
un
i
o C Hamano
M
e
rge branc
h
'jn/m
a
i
n
t-trim-v
i
m-contrib' i
n
to
m
aint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch
'pe
/
doc-emai
l
-env-
i
s-trumped-b
y
-c
o
nfig
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C Hamano
Me
r
ge branch
'
mk
/
complete-tc
s
h' into m
a
int
commit
|
commitdiff
|
tree
2013-01-28
Junio C
Hamano
Merge branch
'
ap/
s
t
atus
-
ignored
-
in-ignored-directo
r
y
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
erge b
r
anch '
e
r/stop-recomm
e
nding-parsec
v
s' into maint
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Hamano
M
erge branch
'mh/ceiling' into 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
J
uni
o
C Hama
n
o
M
e
r
g
e branch 'dl/am-hg-
l
o
c
a
le'
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio
C
Hamano
Merge branch
'
j
c
/h
e
l
p
'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge
b
ran
c
h
'bc/fix-array-syntax-for-3
.
0
-
in-complet
i
on
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matt
h
i
eu
M
oy
a
dd: warn when -u or -A is u
s
ed w
i
thout pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
g
i
t
-remote-tes
t
py
:
f
ix path hashing on
P
y
t
hon 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
mergetoo
l
--lib: don'
t
c
a
l
l "e
x
it" in setup_too
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
mergeto
o
l--lib: impr
o
ve show_
t
ool_hel
p
() outp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merg
e
tools/v
i
m: r
e
move redundant diff comm
a
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te
Wyckoff
git
p4:
i
ntroduce gitConfigB
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: avoid shell when calling git config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
Wyckoff
git p4: avoid shell
w
hen invo
k
in
g
git conf
i
g --get-all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
gi
t
p4: avoid she
l
l when invok
i
ng g
i
t rev
-
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
koff
git p4: avoid s
h
e
l
l when map
p
ing users
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p
4
: d
i
sable read-only at
t
rib
u
te be
f
or
e
delet
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
c
koff
gi
t
p4 test: use te
s
t_chm
o
d
fo
r
cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete
W
yckoff
git p4: cygwin
p
4 client does
not mark rea
d
-only
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
ff
git
p4 test: avoid wildcard *
i
n w
i
ndows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
git p4 test: use Li
n
eEnd unix
i
n
windo
w
s tests too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyckoff
git
p4 test: newline handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
ko
f
f
git p4: scr
u
b crlf for utf16 fil
e
s on windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
gi
t
p4: r
e
move unreachable
w
indows \r\n conversion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
off
git p
4
te
s
t:
t
ransl
a
te windows
p
aths for cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
it p
4
tes
t
: sta
r
t p4
d
insi
d
e it
s
db di
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
ff
git
p
4 t
e
s
t
: use client_view in t980
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git
p
4 te
s
t: avoid
l
o
op in clien
t
_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 p
4
t
e
st: us
e
client_view t
o
build the initial client
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete W
y
ckoff
git p4: genera
t
e
bett
e
r
e
rror messag
e
for bad
d
epot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: remove un
u
sed im
p
orts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4: temp b
r
anch name should use / even
o
n window
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Ju
n
io C H
a
mano
M
e
rge branch 'jk/mai
n
t-gc-au
t
o-after-fetch' into jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Je
f
f King
fetch-
p
ack: avoid repeatedly re-scan
n
ing pack
d
irectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Jeff King
fetch: run gc --auto after fetching
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Sv
e
n Strickroth
m
e
rgetools:
s
upport TortoiseGitM
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Brandon
Casey
git-p4
.
p
y
: support
P
ython 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Brandon Casey
g
it-p4
.
p
y
:
s
u
p
p
o
r
t Python 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff King
l
og
m
sg_reencod
e
:
lazily load missing co
m
mit buffers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff K
i
ng
logms
g
_reenc
o
de: never return NULL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
J
e
ff King
co
m
mi
t
:
d
rop
u
seless xstrdup
o
f commit me
s
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
Merge branch '
f
or-junio' of git://bogomi
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2013-01-25
Junio C Ha
m
an
o
Update d
r
aft
r
el
e
a
se n
o
tes to
1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio
C
Hamano
Merge branch 'nd/retire-fnmatch'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
Merge branch 'jc/doc-main
t
ai
n
er'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
howto/ma
i
ntai
n
: document "### match n
e
x
t"
convention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
d
iffto
o
l: use
git-mergeto
o
l
-
-lib f
o
r "--tool
-
he
l
p"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-mergetool: don't ha
r
dcode 'merg
e
tool' in sho
w
_
t
ool_help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-m
e
rgetool: remove
redundant as
s
ig
n
m
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
g
i
t-mergetool: move
s
how
_
tool_help
t
o mergetool--lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
ona
t
ha
n
N
ieder
ident: do
not
drop u
s
e
r
name when rea
d
ing
fr
o
m /e
t
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
push: finishing
t
ouch
e
s to e
x
plain
REJE
C
T_ALREADY_EXISTS
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-r
e
mote-test
p
y:
c
a
ll prin
t
as a function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-r
e
mote-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
g
i
t-remote-testpy
:
hash bytes exp
l
icitly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow sv
n
rd
u
mp_sim
.
py to run with
P
ytho
n
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git_remote_he
l
p
e
r
s: use 2to3 if build
i
ng with Python 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git_remote_helpers:
f
orce rebuild if pytho
n
version
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio C Hamano
t9902
:
p
ro
t
ect test fro
m
st
r
a
y
build artifacts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
Haman
o
push:
in
t
roduc
e
REJECT_
F
E
T
C
H
_FIRS
T
and REJEC
T
_NEEDS_FORCE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
Hamano
push: fur
t
he
r
simplify
the logic to ass
i
gn rejection
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
push: f
u
rther clean up fields of "struct ref"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Alex
e
y Shumki
n
t7102
(
reset): don't
h
ardcode S
H
A
-1 i
n
exp
e
cted ou
t
puts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
J
ohn
K
eeping
git-cvsimport
.
txt
:
cvs
p
s-2 is
deprecated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C Hamano
Merge b
r
an
c
h 'as/pre-pu
s
h
-
h
ook'
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C H
a
m
a
no
M
erge bra
n
c
h
'ch/add-auto-subm
i
tted-in-sample
-
post
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hamano
M
erge
branch 'as/
c
heck-i
g
nore'
commit
|
commitdiff
|
tree
2013-01-24
J
unio C
Hamano
Merge branch 'rs/clarify-e
n
try-c
m
p-sslice'
commit
|
commitdiff
|
tree
2013-01-24
J
unio C Hamano
Merge
b
r
anch 'jk/suppr
e
ss-
c
l
a
n
g-warning'
commit
|
commitdiff
|
tree
2013-01-24
J
unio C Hamano
M
e
r
ge branch 'cr/
p
ush-force-t
a
g-update'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hamano
Merge branch 'mh
/
imap-send-shrinkag
e
'
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio C Hamano
M
erg
e
bra
n
ch 'mo/
c
vs-s
e
r
v
er-updates'
commit
|
commitdiff
|
tree
2013-01-24
Ju
n
io
C Hamano
Merg
e
branch 'jc/
m
a
k
e
f
ile-
p
erl-p
y
thon
-
pat
h
-do
c
'
commit
|
commitdiff
|
tree
2013-01-23
J
eff King
refl
o
g: use
parse_config_k
e
y in
con
f
ig callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff
K
i
ng
help: use parse_conf
i
g_key for man co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
submod
u
le: simpli
f
y memory hand
l
ing in config par
s
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
su
b
module: use parse_c
o
nfig_key w
h
e
n
p
arsing config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jef
f
K
i
ng
userdiff: dro
p
p
arse_
d
ri
v
er
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
convert some co
n
fig callbacks to par
s
e_
c
on
f
ig_key
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
eff King
archive-tar: use parse_config
_
key w
h
e
n
parsing config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
e
ff
King
config: add
h
elpe
r
function for par
s
in
g
key names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
u
nio
C
Hamano
Merge git:/
/
ozlabs
.
org/~
p
aulus/gitk
commit
|
commitdiff
|
tree
2013-01-22
Junio C H
a
mano
Merge
b
r
a
nch 'jc/merge-blob
s
'
commit
|
commitdiff
|
tree
2013-01-22
R
a
msay
J
o
nes
Makefile: Replace
m
erge-file
.
h wi
t
h merge-blobs
.
h in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Update
d
raft release n
o
tes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Junio C
H
amano
M
e
r
ge
b
r
a
n
ch
'mz/r
e
set
-
misc'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Merge branch 'nd/fix-directory
-
attrs-off-by-one'
commit
|
commitdiff
|
tree
2013-01-22
Robin Rosen
b
erg
Enable minimal
s
tat
checking
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Ham
a
n
o
Merge bran
c
h 'pw/p
4
-b
r
anch-fixes'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hama
n
o
Merge br
a
n
ch 'mh/r
e
mote-hg-mode-bi
t
s-fi
x
'
commit
|
commitdiff
|
tree
next