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 'jc/combine-diff-many-parents'
2013-01-29
David Aguilar
m
e
r
getool--lib:
i
mprove
t
he help
text in guess_
m
erge_to
o
l()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetool--l
i
b:
s
i
mplify c
o
mmand expre
s
sions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
J
unio C H
a
mano
Merge branch 'nd/fix-directory
-
a
t
trs-off-by
-
one'
into
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
J
u
nio
C
Ha
m
a
n
o
Merge branch 'ph/rebase-p
r
eserve-all-merges' into ma
i
n
t
commit
|
commitdiff
|
tree
2013-01-29
Junio C H
a
ma
n
o
R
EADME:
upd
a
te
s
t
ale and/or incorrect
information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
mergetool
s
:
simp
l
ify h
o
w
w
e handle "vim" and "d
e
faults"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Andrej E Baranov
gitweb: refer to pico
n
/gravatar image
s
over
t
he sa
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hama
n
o
Update dr
a
ft release notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o
C Hama
n
o
Sync wi
t
h
1
.
8
.
1
.
2
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
amano
Git 1
.
8
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge b
r
anch 'ss/help-htmlpath
-
co
n
fig-doc' into mai
n
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hama
n
o
M
e
rge bran
c
h 'nd/attr-debu
g
-
f
ix
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ham
a
no
M
e
r
g
e
b
ranch
'
ds/completi
o
n-silence-in-tree-path-probe
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C Hama
n
o
Merge branch 'jn/maint-trim-vi
m
-con
t
rib
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch 'pe/doc-email-env-is-t
r
umped-by-config
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
H
amano
Merge branch
'
m
k
/comp
l
ete-tcsh' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge
branch 'ap/status-ignor
e
d-in-i
g
no
r
ed-dir
e
ctory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
erge
branc
h
'er/s
t
o
p-recommending-parsecvs' into maint
commit
|
commitdiff
|
tree
2013-01-28
J
u
n
i
o
C Hamano
M
erg
e
bran
c
h 'mh/ceiling' into maint
commit
|
commitdiff
|
tree
2013-01-28
J
u
ni
o
C
Haman
o
M
e
rge branch 'tb/t0
0
50-m
a
int'
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C Ha
m
an
o
M
e
r
ge bran
c
h
'dl/am-hg-loca
l
e
'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ham
a
no
M
erge b
r
a
nch 'jc/hel
p
'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
e
rg
e
b
r
anch 'bc/fix
-
a
r
ra
y
-sy
n
tax-for-3
.
0-in-com
p
l
e
tion
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matthieu Moy
add
:
warn when
-
u or -A is use
d
without pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
n
g
git-remote-testpy: fix path hash
i
ng on
P
ython 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn K
e
epin
g
mergeto
o
l--lib: don't
cal
l
"exit" i
n
setup_tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
merg
e
t
ool--lib
:
improve sh
o
w_to
o
l_help()
o
utput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
mer
g
etools/vim
:
remove re
d
undant diff
c
ommand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
f
f
git p4:
i
ntroduce git
C
o
n
figBool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyckoff
g
it p4
:
avoid shel
l
when calling git co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p
4:
a
void shell
w
hen
invoking
gi
t
config --get-all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e
Wyckoff
g
it p4: avoid shell whe
n
invoking g
i
t rev-
l
i
st
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
m
a
pping users
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
git
p4: disable read-only attri
b
ute before
de
l
et
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
g
i
t p4
t
est: u
s
e test_chmo
d
for
c
ygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete Wyckoff
git
p4: cygwin p4 client
d
o
es not
m
a
rk read-o
n
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
git p4 test: avoid wil
d
ca
r
d * in wi
n
dows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
k
o
ff
g
it p4
t
est:
use LineE
n
d unix in
win
d
ows tests too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
git p
4
test: ne
w
line hand
l
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
Wyckoff
git p4:
scrub crlf
for utf16 files on windo
w
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: remov
e
unre
a
ch
a
ble windows \r\n convers
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wyckof
f
git p
4
tes
t
: translate window
s
paths for cyg
w
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ck
o
ff
git p
4
test: start
p4d insi
d
e it
s
db dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
y
c
k
o
f
f
git p4
t
e
st: use clien
t
_vi
e
w in
t9806
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e
W
yc
k
o
f
f
git p4
t
est:
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
t
est
:
use
c
li
e
nt_vi
e
w
to build the i
n
itial client
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete
W
y
ckof
f
git p4:
g
enera
t
e
better er
r
or message for
bad depot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
off
g
i
t p4
:
remove unu
s
e
d
imports
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4:
t
emp branch na
m
e should use / even on windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Junio
C Hamano
Merge b
r
a
n
c
h 'jk
/
maint-gc-aut
o
-a
f
t
er-fetch
'
into jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
J
eff K
i
ng
fetch
-
pack: avoid
r
epe
a
tedly
re-scan
n
ing pac
k
directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Jeff King
fetch:
ru
n
gc --aut
o
after fetch
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Sven S
t
rickro
t
h
mergetoo
l
s: support TortoiseG
i
tMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
B
r
andon Casey
git-p4
.
py: suppo
r
t Python
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
B
rando
n
C
a
sey
git
-
p
4
.
p
y
:
suppo
r
t P
y
thon
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff Kin
g
logm
s
g_re
e
ncode: lazily loa
d
miss
i
ng commit buffe
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jef
f
K
ing
logmsg_reencod
e
: n
e
ver retur
n
NULL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff
K
ing
c
o
mm
i
t:
drop us
e
less xstrdup
of commit messag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hama
n
o
Mer
g
e
bran
c
h 'for-juni
o
' of git://bogomip
s
.
org/g
i
t
-svn
commit
|
commitdiff
|
tree
2013-01-25
Junio C Ha
m
ano
Upd
a
te
d
raft rele
a
s
e
n
otes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Ju
n
io C Hamano
Me
r
g
e
branch
'nd/r
e
tire-fnmatc
h
'
commit
|
commitdiff
|
tree
2013-01-25
Junio C
H
amano
Merge
b
r
a
nch
'
jc/d
o
c
-maintainer'
commit
|
commitdiff
|
tree
2013-01-25
Junio C H
a
m
ano
howto/mai
n
tain: docu
m
ent "### mat
c
h next
"
convention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
gi
t
-di
f
ftool: use git-m
e
r
g
etool--lib for "
-
-tool-help"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-merge
t
oo
l
: do
n
't hard
c
o
d
e
'merget
o
o
l' in show_to
o
l_help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keepi
n
g
git-mergetool: remov
e
redundant assignment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
gi
t
-mergetool: move show_tool_help to
m
ergetool--lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Jonat
h
an Nieder
ident: do not drop
u
sername when reading from /etc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Juni
o
C Hamano
push: f
i
nishing touches to explain
R
E
JECT_ALREADY_EXISTS
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
git-remo
t
e-testpy: call print as a funct
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
i
t-re
m
o
t
e
-testpy: d
o
n't do unbuffered
t
e
x
t I
/
O
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
g
it
-
remote-testp
y
: hash b
y
t
es
explicitly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: al
l
ow
s
vnrdump_
s
i
m
.
py to run with Python
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
g
i
t_
r
emote_helpers: 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
J
o
hn Ke
e
ping
git
_
r
e
mote_he
l
pers: for
c
e rebuild if python version
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C
H
amano
t9902: protect test from st
r
ay build
a
rtifacts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
pus
h
: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FO
R
CE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C
H
a
ma
n
o
p
u
s
h
: further simplify th
e
lo
g
i
c
to a
s
sign reje
c
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C H
a
mano
p
ush: fu
r
t
h
er clea
n
up f
i
elds
of "st
r
uct
r
ef"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Alexey Shumkin
t
7
1
0
2 (reset): don't hardcode SHA-1 in exp
e
cted outputs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
Keeping
g
i
t-cvsi
m
port
.
txt:
c
vsps-2 is deprecated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Mer
g
e
bra
n
ch 'as/pre-push-hook'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Merge
branch 'ch/ad
d
-au
t
o-submi
t
t
e
d-i
n
-sample-pos
t
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Merge b
r
anch
'
as/
c
heck
-
ignore'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
H
amano
Merge branc
h
'rs/clarify-entry-c
m
p-sslice'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hamano
Merge
branch
'jk
/
suppres
s
-clang-warning
'
commit
|
commitdiff
|
tree
2013-01-24
Junio C H
a
m
a
n
o
Merge branch 'cr/push-force-tag-up
d
ate
'
commit
|
commitdiff
|
tree
2013-01-24
J
unio C Hamano
Merge b
r
an
c
h 'mh/imap-se
n
d
-shri
n
kage'
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C Hamano
Merge branch 'mo/cvs
-
server-updates'
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
H
a
m
ano
Merge branch
'
jc/
m
akefile-p
e
rl-python-path-doc'
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
reflog: us
e
parse_config_key in confi
g
callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
e
ff King
help: use parse_c
o
nfig_key for man
config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Je
f
f
King
submodule: simpli
f
y memory han
d
ling in config
p
a
r
s
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff
K
ing
submodule: use
pa
r
se_confi
g
_key whe
n
parsing c
o
nf
i
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
eff King
us
e
rdiff:
drop pa
r
se_driver functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jef
f
King
conve
r
t some config callba
c
k
s to parse_c
o
n
f
i
g
_
k
ey
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
archive-t
a
r: use parse_co
n
fig_key w
h
en
parsing config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
J
eff King
con
f
ig: add helper f
u
n
c
tion
f
or parsing key na
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-23
Junio C Ha
m
a
n
o
Merge git://ozlabs
.
org/~paulus/gitk
commit
|
commitdiff
|
tree
2013-01-22
J
u
n
io C H
a
m
ano
Mer
g
e
b
ra
n
ch 'jc/me
r
ge-bl
o
bs'
commit
|
commitdiff
|
tree
next