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
2012-12-26
Junio C Hamano
merge-tree
:
f
ix d/f conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tree: add
comments to
cl
a
rify what these functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
J
u
nio C Haman
o
merg
e
-tree: lose unused "resolve
_
d
i
rector
i
es"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tree: lose unused "flags" f
r
om merge_l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Junio C
Hamano
Which merge_file()
f
unction
d
o
you
m
ean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Jun
i
o C Hamano
Mer
g
e branc
h
'mm/stat
u
s-push-pul
l
-advi
s
e'
commit
|
commitdiff
|
tree
2012-12-03
Junio C
H
aman
o
G
it
1
.
8
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Hamano
Mer
g
e
b
ranc
h
'mm/status-push
-
pull-
a
dvise'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
a
m
a
n
o
Update draft release notes
to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C
H
a
mano
Merge branch 'pw
/
p4-va
r
io
u
s
-
fix
e
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hama
n
o
M
e
r
ge branch 'lt/d
i
ff-st
a
t
-sh
o
w-0-
l
in
e
s'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Ha
m
ano
Merge
branch 'fc/r
e
mote-hg
'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Ham
a
n
o
Merge branch 'mk/
c
omplete-tcs
h
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
Merge branch '
j
c
/
doc-push-s
a
tellite'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
ano
Merge branch 'km/s
e
n
d-e
m
ail-remove-cruft-
i
n
-
address'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Hamano
Merge
b
r
anch 'jk/send-em
a
il-sender-p
r
ompt
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
a
man
o
Merge br
a
n
c
h 'f
c
/s
e
nd
-
email-no
-
sender-pro
m
pt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ham
a
no
M
e
rge bra
n
c
h
'er/
d
oc-add
-
ne
w
-commands
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
amano
M
erge branc
h
'jl/submodul
e
-rm
'
commit
|
commitdiff
|
tree
2012-11-29
J
u
ni
o
C
Haman
o
Mer
g
e
b
ranc
h
'pp/
g
itweb-config-unders
c
ore'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Ha
m
ano
Me
r
ge b
r
anch 'fc/c
o
mpletion-test-sim
p
l
ificat
i
on'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio
C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ham
a
no
Merge branch 'm
a
ster' of git://github
.
com/
g
it-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
a
m
ano
t4049: re
f
ocus tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio
C Hamano
Merg
e
branch 'master' of
g
it:
/
/
g
ithub
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio
C Hamano
Merg
e
bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2012-11-28
J
unio
C Haman
o
U
pdate draft release not
e
s to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Merge b
r
anc
h
'
fc/zsh-completion'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
a
n
o
Me
r
ge
b
ranch '
m
m/sta
t
u
s
-
push-pull
-
a
dvise'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge br
a
nch 'jk/pickaxe-textconv
'
commit
|
commitdiff
|
tree
2012-11-28
Junio
C H
a
mano
Start prepa
r
i
n
g for 1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
M
e
r
g
e
branch
'rh/maint-gitweb-highlig
h
t
-
e
x
t' into maint
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Merge branch '
p
w/m
a
int-p4-rcs-expansion-newline' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
n
o
M
e
rge bra
n
c
h 'fc/send-email-n
o
-sender-prom
p
t' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C Hamano
D
ocumentation/git-
p
us
h
.
txt: clarify the "push
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
a
mano
di
f
f
-
-shortstat: d
o
not count "un
m
e
rged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ha
m
ano
Merge branch 'nd/ma
i
nt-compat-f
n
match-fix' into main
t
commit
|
commitdiff
|
tree
2012-11-27
Junio C Haman
o
Me
r
ge branc
h
'jh/update-ref-d-
t
hrough-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
Merge
b
r
anch 'e
s
r/ma
i
n
t
-
doc-fas
t
-
i
mport' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge b
r
anch
'
wtk/submodule-doc-fixup'
into
main
t
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
d
iff --stat:
do no
t
c
ount "unmerged"
e
n
tries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Hamano
diff --stat: mo
v
e the "total cou
n
t
"
logic t
o
the l
a
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
d
iff
-
-stat:
u
s
e
"fi
l
e
" temporary vari
a
b
le to r
e
fer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ham
a
no
diff
-
-
stat
:
statu
s
of unmod
i
fie
d
pair in diff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Haman
o
t
e
st:
add failing tes
t
s for "d
i
f
f
--stat" to t4049
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C Hama
n
o
Update
d
ra
f
t release
notes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Hamano
Merg
e
branch 'rr/submod
u
le-diff-
c
o
n
f
ig'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Merge branch
'nd/maint-com
p
at-fnmat
c
h-fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
ama
n
o
Merge branch 'bc/do-n
o
t-recurs
e
-in-die'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'mk/comp
l
ete
-
t
c
s
h
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hama
n
o
Mer
g
e branch
'jh/upd
a
te-
r
ef-d-through-symref'
commit
|
commitdiff
|
tree
2012-11-26
J
u
n
i
o C Hamano
Merge branch 'lt/d
i
f
f
-
s
t
at-show-
0
-li
n
es'
commit
|
commitdiff
|
tree
2012-11-26
J
u
n
io C Hamano
Merge
b
ran
c
h 's
g
/compl
e
te-help-undup'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C Hamano
Sync w
i
th 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
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 br
a
nch 'j
k
/ch
e
ckout-
o
ut-
o
f-unb
o
rn' into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
Merge
b
ra
n
ch 'cn/config
-
missing-pat
h
' into maint
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C Hamano
Merge br
a
nch 'jk/maint-
g
i
t
web-xss' into
m
ain
t
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Update draft relea
s
e
n
otes
for
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C H
a
mano
M
erge bra
n
ch 'esr/maint-doc-fa
s
t-im
p
ort'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge
bran
c
h 'wtk/
s
ubm
o
dule-doc-fixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hama
n
o
Merge br
a
nch 'so/prompt-command'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hama
n
o
Mer
g
e branch
'
jk/config-igno
r
e-duplic
a
tes'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
M
erge branch 'jk/m
a
int-http-ha
l
f
-
auth-fetc
h
'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Hamano
Si
x
th b
a
tch for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'ml/
c
y
gwin-mingw-h
e
ade
r
s
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Merge
b
ranch 'jk/checkout-o
u
t-
o
f
-
unb
o
rn'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Hamano
Me
r
ge branch 'cn/config-missing-path
'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Hamano
Merge branch 'jl/submo
d
ule-
r
m'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Me
r
ge branch 'mg/re
p
lace-resol
v
e-de
l
ete'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge branch 'jk/ma
i
n
t
-gitweb-
x
ss'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C
H
am
a
no
Merge branch 'rh/maint-
g
i
twe
b
-hig
h
light-e
x
t'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Hamano
Mer
g
e branch '
p
w/maint-p4-rcs-expansion-
n
ewline'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Merge
b
r
a
nch 'mh/alt-o
d
b-string-list-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Merge bran
c
h 'ta/doc-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
r
ge bran
c
h 'kb/prelo
a
d
-index-
m
ore'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge
branc
h
'j
k
/m
a
int
-
h
t
tp-
h
alf
-
auth-f
e
t
c
h'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
S
y
nc with maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Further prep
a
ration for 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Hamano
Merge branch
'
mg/maint-pull-sugg
e
st-up
s
trea
m
-
to
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C
H
aman
o
Merge
b
ranch 'm
m
/maint-doc-commit-edi
t
' into maint
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io
C
H
amano
M
erge branch '
a
s/maint-doc-fix-no-pos
t
-r
e
wr
i
te'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
M
e
rg
e
branch 'rs/lock-correct-re
f
-duri
n
g-delete' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
erge bra
n
c
h
'r
f
/maint
-
m
ailmap-o
f
f-by-one' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge
b
ranch 'jk/maint-diff-grep-textconv'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
erge branch 'js/f
o
rma
t
-2047' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C H
a
mano
Star
t
preparing fo
r
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-19
Junio
C
H
amano
M
e
rge
b
ranch 's
z
/main
t
-curl-m
u
lti-timeout' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
J
u
n
i
o
C Haman
o
M
erge bra
n
ch 'po/maint-refs-replace-docs' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Ham
a
no
Merge bran
c
h 'ph/p
u
ll-
r
eba
s
e-detac
h
ed' into
m
aint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io
C
Ham
a
no
Merge br
a
nch '
m
m/maint-doc-rem
o
te-trackin
g
'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2012-11-19
J
unio C H
a
mano
Merge branc
h
'r
s
/br
a
nc
h
-del
-
symref' into maint
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C Hama
n
o
Merge branch 'nd/grep-true-pa
t
h' int
o
m
aint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Me
r
ge branch '
j
c/grep-pcre-loose-ends
'
(
e
a
rly pa
r
t
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Junio C
Hamano
Merge branch
'
d
a/me
r
getools-p4'
into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merg
e
branch
'jc/test-say-c
o
lor-
a
vo
i
d-
e
cho-escap
e
'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Junio C
H
a
mano
Me
r
g
e
branch
'
bw/config-lift-variable-name
-
len
g
th-limit
.
.
.
commit
|
commitdiff
|
tree
next