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
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
2013-01-22
Ramsa
y
Jones
Makefil
e
:
Replace merg
e
-file
.
h w
i
th merge-blobs
.
h in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Jun
i
o C Hamano
merge-tree:
fix d/f conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Juni
o
C Hamano
merge-tree: add
c
omments to clarify w
h
at these functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Ju
n
io C
H
amano
m
erge-tree: lose unused
"res
o
l
ve_directories
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tree: lo
s
e
u
n
used "flags" f
r
om merge_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Junio C Hamano
Which merge_f
i
l
e() f
u
nction
do
y
ou mean
?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Junio C Ha
m
ano
M
er
g
e
branc
h
'mm/sta
t
u
s
-push-pull-adv
i
s
e'
commit
|
commitdiff
|
tree
2012-12-04
Matthieu
M
oy
doc
u
ment th
a
t
s
t
a
tusHints affects gi
t
checkout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio
C Haman
o
Gi
t
1
.
8
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio
C Hamano
Merge
b
r
anch 'mm/stat
u
s
-
push-pul
l
-adv
i
se'
commit
|
commitdiff
|
tree
2012-12-03
Jeff King
s
tatus: re
s
pect
a
dvice
.
statusHints for ahead
/
behind
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
ano
Update
d
raft release notes t
o
1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
J
u
n
i
o
C
Hamano
Merge branch 'p
w
/
p
4-vario
u
s-fixes'
commit
|
commitdiff
|
tree
2012-11-29
J
uni
o
C Hamano
Merge
b
ranch 'l
t
/diff-
s
tat-s
h
ow-0-l
i
nes'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ham
a
no
Merge bran
c
h 'f
c
/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Me
r
ge branc
h
'mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
a
mano
Merge branch
'jc/d
o
c-push-s
a
tellite'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Me
r
ge branch 'km/s
e
nd-email-remove-
c
ruft-
i
n-addre
s
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio C H
a
mano
Merge
br
a
nch 'jk/send-ema
i
l-sender-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Merge branch 'fc/send-emai
l
-no-send
e
r-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Merge branch 'er/
d
oc-add-new-co
m
man
d
s
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
e
rge
b
ranch 'jl/submodule-rm'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
a
n
o
Merge branch 'pp/gitweb-config-und
e
r
s
core'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
amano
Merge bran
c
h 'fc
/
completi
o
n-test-simplification'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2012-11-29
M
atthieu Mo
y
git-fast
-
import
.
txt
:
im
p
r
o
ve do
c
ume
n
tation for quoted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Matthi
e
u
Moy
git-
r
em
o
te-mediawiki: es
c
ape ",
\, and LF
i
n
f
i
le names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge bran
c
h 'master' o
f
gi
t
://github
.
com/g
i
t-l
1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C H
a
mano
t4049: refo
c
us tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Feli
p
e
Contreras
complet
i
on: fix w
a
rnin
g
for
zsh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Ha
m
ano
Me
r
ge branch 'm
a
ster' of
git://github
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
J
unio C Hamano
Merge branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C Ham
a
no
Update draft rele
a
s
e notes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o
C Hamano
Merge branch
'f
c
/zsh-completi
o
n'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
H
am
a
no
M
e
r
ge
branch 'mm
/
s
tatus-push-pull-adv
i
se'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Hamano
M
e
r
g
e
branch 'jk/pickaxe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Hamano
Start prepar
i
n
g
for 1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jeff King
t
9001: check send-email behavi
o
r with impl
i
c
it sender
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C Hamano
Merge bran
c
h 'rh/maint-gitweb
-
hi
g
hlight-ext' into maint
commit
|
commitdiff
|
tree
2012-11-28
J
u
ni
o
C Haman
o
Merge branch 'p
w
/maint-p4-rcs-expansion-new
l
ine' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ralf Thielow
c
o
mpl
e
tion:
add
o
pt
i
ons --single-b
r
anch
a
nd --branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge b
r
an
c
h 'fc/send
-
emai
l
-
n
o
-sender-p
r
o
m
pt' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jeff King
t: add tests f
o
r "g
i
t var"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Ham
a
no
Documentat
i
on/git-push
.
txt: cl
a
rify
the "push from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Contreras
remote-hg:
fix for older versions of python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Felipe Contr
e
ras
remote-
h
g
:
fix
f
or files with sp
a
ces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C H
a
m
a
n
o
d
iff --shortsta
t
:
d
o
not count
"
unmerged" en
t
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ha
m
ano
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Ham
a
no
Merge
b
ra
n
c
h 'nd/main
t
-comp
a
t
-
fn
m
atch-fix' into
m
a
int
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Hamano
Merge bra
n
ch 'jh/updat
e
-
r
ef-d
-
throug
h
-
symref' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge b
r
an
c
h '
e
sr/maint-doc-fast-import'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
M
e
rg
e
bran
c
h 'wtk/submodu
l
e
-do
c
-fixup'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-27
J
un
i
o C
Hamano
di
f
f --sta
t
: do not count "unmerg
e
d" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
unio C Hamano
diff --
s
tat: mo
v
e the "total count
"
l
ogic to th
e
last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
di
f
f
--stat: use "fil
e
"
te
m
porary v
a
r
iable to
r
efer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
diff --stat:
s
tatus of unmodifie
d
pair
in
d
iff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Haman
o
test: add f
a
iling t
e
s
t
s
for "diff -
-
stat" to t4
0
49
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
M
a
r
c Khouzam
S
u
pport
f
or git aliasing for
tc
s
h c
o
mpletion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Mark Szepieniec
Documentation: im
p
rove
phr
a
s
i
ng in git-push
.
t
xt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysz
t
of Mazur
git-send-email: allow edit invalid email address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Kr
z
yszto
f
Mazur
git
-
send-email: ask what to do with an inval
i
d emai
l
.
.
.
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
K
rzysztof Mazur
git-send-email: remove invalid ad
d
r
ess
e
s e
a
rli
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hama
n
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-11-26
Eric S
.
Raymond
Docume
n
tation:
how to add a ne
w
command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Antoine Pelisse
Fix
t
ypo in rem
o
te se
t
-head u
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Felipe Co
n
treras
send-email: avoid questi
o
ns wh
e
n user
h
as
a
n ident
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pe
t
e
Wyckoff
git p4: r
e
move
u
nn
e
eded cmd initi
a
l
izatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pe
t
e Wyc
k
off
git p4:
f
ix lab
e
l
Deta
i
l
s
typ
o
in
excep
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pe
t
e Wyckoff
git p4
t
est: dis
p
lay unresolva
b
le host error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pet
e
Wy
c
kof
f
git p4: catch p4
errors
when streami
n
g
file
contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
P
e
te W
y
ckof
f
git p4:
h
andle servers with
o
ut move
sup
p
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4
:
ca
t
ch p4 describe errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Paul G
o
rtmaker
Makefile
:
h
ide st
d
err of curl-config test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Enrico Scholz
emacs
:
make 'git-status' work with sepa
r
a
te git dirs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzys
z
t
o
f
M
azur
git-send-email: fix fallback code in ext
r
act_va
l
id_address()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Krzysztof Mazur
gi
t
-send-email: remove g
a
rbag
e
after email
a
ddress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Up
d
a
te draft relea
s
e notes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hamano
Merge branc
h
'rr/
s
ub
m
o
dule-diff-config'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Merge bra
n
ch 'nd/maint-compat-fn
m
atc
h
-fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
an
o
Merge bran
c
h
'bc/do-not-recurse-in-die'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
Merge
b
ranch 'mk/complete-tcsh
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'jh/upda
t
e-ref-d-t
h
roug
h
-
sy
m
ref'
commit
|
commitdiff
|
tree
2012-11-26
J
u
ni
o
C Ham
a
no
Merge
branch
'lt/d
i
ff-stat-sh
o
w-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
Merge branch 'sg/comple
t
e-he
l
p-und
u
p
'
commit
|
commitdiff
|
tree
2012-11-26
J
unio C Hamano
S
y
nc with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
io C Hamano
G
it 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch
'jk/c
h
ec
k
out
-
ou
t
-of-un
b
o
r
n' into
m
aint
commit
|
commitdiff
|
tree
2012-11-26
J
uni
o
C Hamano
M
e
rg
e
branch 'cn/config
-
mis
s
ing
-
pa
t
h
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
M
e
rge branch 'jk/
m
ai
n
t-gitweb
-
xss'
int
o
m
a
int
commit
|
commitdiff
|
tree
2012-11-25
Mar
c
Kh
o
uzam
Completion mus
t
sort before usin
g
u
n
iq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-24
Jens Lehmann
Teach r
m
to re
m
ove submodules when given
w
ith
a trailing '/'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Update d
r
aft rel
e
ase no
t
es for
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge branch 'esr/maint-doc-fas
t
-import'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge branch
'
w
t
k/submodule-doc-fixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Ha
m
ano
Merge branch 'so/p
r
ompt-comm
a
n
d
'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C Ham
a
n
o
Merge branch 'jk/
c
onf
i
g
-
ignore-duplica
t
es'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge branc
h
'jk/maint
-
http-hal
f
-au
t
h
-
fetch'
commit
|
commitdiff
|
tree
2012-11-21
Phil Pennock
gitweb:
m
ake remote_he
a
ds
c
onfig s
e
tti
n
g
w
o
r
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Ram
s
ay Jone
s
remote-c
u
rl
.
c: Fix
a
compi
l
er warn
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Ng
u
y
ễn Th
á
i
N
g
ọ
c Duy
compat/fnma
t
ch: fix
o
ff
-
by-
o
ne cha
r
acte
r
class's length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next