repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
2017-11-12
Stefan
B
e
ller
t/3512: demonstrate unrelated submodule/
f
i
l
e conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-30
Junio C
Haman
o
Git 2
.
15
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-30
Junio C Hamano
Merge tag 'l10n-2
.
15
.
0
-
rnd2
.
1' of git://github
.
com
.
.
.
commit
|
commitdiff
|
tree
2017-10-28
Junio
C Hamano
H
o
pe
f
ully
f
i
n
a
l
batch before 2
.
15
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-28
Ju
n
io C Hamano
Me
r
ge
bra
n
ch 'sg
/
rev-l
i
st-
d
oc-reorder-fix'
commit
|
commitdiff
|
tree
2017-10-28
Junio C
H
amano
Merge branch 'sb/
r
ev-parse-show-superp
r
oje
c
t-root
'
commit
|
commitdiff
|
tree
2017-10-28
Junio C Ha
m
ano
Merge
branch
'a
o
/pat
h
-use-xmalloc'
commit
|
commitdiff
|
tree
2017-10-28
Junio C Ha
m
an
o
Mer
g
e branch
'
np/confi
g
-pa
t
h-
d
oc'
commit
|
commitdiff
|
tree
2017-10-27
Sebasti
a
n Schuberth
docs
:
fix fo
r
matt
i
n
g of
r
ev-parse's --show-superproje
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-27
S
ZEDER G
á
bor
rev-list-opt
i
on
s
.
txt:
use corr
e
ct
directional r
e
fer
e
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-26
Junio C Hamano
Merge br
a
n
ch 'mh/ref-
l
o
cki
n
g
-
f
ix'
commit
|
commitdiff
|
tree
2017-10-25
A
ndr
e
y Okoshki
n
path
.
c: u
s
e xmalloc() in ad
d
_
t
o_trie()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-25
Michael Hagg
e
rty
files
_
transac
t
ion_p
r
epare(): fi
x
handli
n
g of ref lock
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-25
Michael
H
aggerty
t1404: add a bunch of t
e
sts of D
/
F conf
l
ic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-24
J
unio C H
a
m
a
no
Merg
e
tag 'l10n-2
.
15
.
0-rn
d
2' of git://gith
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2017-10-23
J
unio C
Hamano
Sync wit
h
2
.
14
.
3
commit
|
commitdiff
|
tree
2017-10-23
Junio C Hamano
Git 2
.
14
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-23
Junio
C H
a
mano
Merge branch
'
jk/i
n
f
o-alternates-
f
ix' into maint
commit
|
commitdiff
|
tree
2017-10-23
J
u
nio
C Hamano
Me
r
ge branch 'jc/fetch
-
refs
p
ec-doc-update' into maint
commit
|
commitdiff
|
tree
2017-10-23
Junio C Hama
n
o
M
erge
branch 'jk/w
r
ite-in-full-fix' into
m
a
i
nt
commit
|
commitdiff
|
tree
2017-10-23
Junio C Hamano
Merge branch 'rj/no-
s
ign-
c
omp
a
re'
i
n
to maint
commit
|
commitdiff
|
tree
2017-10-23
J
u
nio C Ham
a
no
Merge branch 'ma/ts-c
l
eanups' into maint
commit
|
commitdiff
|
tree
2017-10-23
Junio C
H
amano
Merge branch
'
l
s
/t
r
a
v
is-s
c
ri
p
tify' in
t
o main
t
commit
|
commitdiff
|
tree
2017-10-23
J
u
nio C Hamano
Merge branch 'er/fa
s
t
-
import-d
u
mp
-
r
efs-on-
c
heckpoint
.
.
.
commit
|
commitdiff
|
tree
2017-10-23
Ju
n
i
o C Hamano
Merge branch 'jt/fast-
e
xport
-
copy
-
modi
f
y-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2017-10-23
Junio C Haman
o
Merg
e
br
a
n
c
h
'
nd/wo
r
ktre
e
-k
i
ll-p
a
rse-
r
ef' into main
t
commit
|
commitdiff
|
tree
2017-10-19
Junio C Hamano
G
i
t 2
.
15-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-19
Junio
C
H
a
ma
n
o
Merge b
r
a
nch 'jc
/
branch-for
c
e
-
d
oc-readability-fix'
commit
|
commitdiff
|
tree
2017-10-19
Junio C Hama
n
o
M
e
r
g
e branch '
d
g/filte
r
-bran
c
h-f
i
lter-o
r
der-doc'
commit
|
commitdiff
|
tree
2017-10-19
Junio
C
Hama
n
o
Mer
g
e branch 'j
c
/fetc
h
-r
e
fspe
c
-doc-update'
commit
|
commitdiff
|
tree
2017-10-19
Junio C Hamano
Merge branch 'wk/me
r
ge-opti
o
ns
-
g
pg-sign-doc
'
commit
|
commitdiff
|
tree
2017-10-19
Nathan
P
a
yre
config doc: clarify "git
c
o
n
f
i
g --path" ex
a
mple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2017-10-18
Jun
i
o
C Hamano
Prepare for
2
.
14
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Merge branch
'
jk
/
ref-filter-c
o
lor
s
-fix' int
o
mai
n
t
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Merge b
r
anch 'j
c
/
d
oc-checkout' into mai
n
t
commit
|
commitdiff
|
tree
2017-10-18
J
u
n
io
C
Ha
m
ano
Merge bra
n
ch 'tb/co
m
p
l
e
t
e
-de
s
cribe' into maint
commit
|
commitdiff
|
tree
2017-10-18
Junio
C
H
amano
M
e
rg
e
branch
'
r
s/rs
-
mailmap' into maint
commit
|
commitdiff
|
tree
2017-10-18
J
u
nio C Haman
o
Me
r
ge branch 'rs/fsck-null-return-f
r
om-loo
k
up' into
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
J
u
nio C Ha
m
ano
M
e
r
g
e
branc
h
'j
k
/
s
ha1-loose-objec
t
-info-fix' in
t
o
m
aint
commit
|
commitdiff
|
tree
2017-10-18
Jun
i
o
C
H
a
mano
Merge b
r
anch 'sb
/
bran
c
h-a
v
oid-repeated-strbuf-release
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Merge bran
c
h 'rs/q
s
ort-s'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Merge branch 'jn/strbuf-doc-re-reuse' into m
a
int
commit
|
commitdiff
|
tree
2017-10-18
Junio C
H
a
mano
Merge branch '
r
s/ru
n
-comm
a
nd-use-al
l
oc-array' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
M
e
r
ge branch 'rs/tag-n
u
ll-pointer-arith-fix'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2017-10-18
Junio C H
a
mano
Merge bra
n
ch 'rs/cocci-
d
e-
p
a
ren-call-params' into maint
commit
|
commitdiff
|
tree
2017-10-18
Ju
n
io C Ha
m
ano
Merge branc
h
'
a
d/doc-ma
r
ku
p
-fix' into mai
n
t
commit
|
commitdiff
|
tree
2017-10-18
Junio C Ham
a
no
M
e
rge
b
ranch 'mr
/
d
oc-neg
a
tiv
e
-pathspec' i
n
to maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C Ha
m
ano
Me
r
g
e
br
a
nch 'jk/validate-head
r
ef-fix'
into
maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C
H
aman
o
Mer
g
e branch 'ks/do
c
-use-ca
m
elca
s
e-fo
r
-config-name
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
J
u
nio C Hamano
Merge
b
ranch 'jk
/
doc-read-tree-table-asciidoc
t
or-fix
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Jun
i
o
C
Ha
m
a
n
o
Merge branc
h
'hn/typofix' into maint
commit
|
commitdiff
|
tree
2017-10-18
Ju
n
io
C
Hamano
Merge b
r
an
c
h 'ks/tes
t
-r
e
adme-phra
s
ofix' into ma
i
nt
commit
|
commitdiff
|
tree
2017-10-18
J
unio
C
Ha
m
ano
M
e
r
ge
branch 'ez/doc-duplicated-wo
r
ds-fix' into maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C
Hamano
Me
r
ge bra
n
ch 'kd
/
doc-f
o
r-e
a
ch-ref' into maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Merg
e
bran
c
h
'cc/subprocess-handshake-m
i
ssing-capabilities
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Junio C
H
a
m
ano
Merge branch
'jk/system-pa
t
h-cl
e
anup
'
into maint
commit
|
commitdiff
|
tree
2017-10-18
J
u
nio C H
a
m
ano
Merge branch 'b
b
/doc-eol-di
r
ty' i
n
to main
t
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hama
n
o
Me
r
ge b
r
an
c
h 'mg/time
s
tamp-t-fix' into maint
commit
|
commitdiff
|
tree
2017-10-18
Ju
n
io C Hamano
Merge b
r
anch 'ma
/
pkt-line-leakfix' into
maint
commit
|
commitdiff
|
tree
2017-10-18
Jun
i
o C Ha
m
an
o
M
e
rge
b
r
a
nch '
j
k/confi
g
-lockfile-leak-fix' into
maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C
H
a
mano
Merge br
a
nch 'dw/diff-high
l
i
g
ht-makefile-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Jun
i
o
C Hamano
Merge br
a
nc
h
'
j
k/
d
ro
p
-sha1-e
n
try-
p
o
s
' into mai
n
t
commit
|
commitdiff
|
tree
2017-10-18
Junio
C Hamano
M
erge branch 'tb/ref-filter-empty-modifier' into mai
n
t
commit
|
commitdiff
|
tree
2017-10-18
J
unio C H
a
mano
Merg
e
bra
n
ch 'rb/compat-poll-fix' i
n
to
m
aint
commit
|
commitdiff
|
tree
2017-10-18
Junio
C Ham
a
no
Merge
branch 't
g
/mem
f
ixes' into maint
commit
|
commitdiff
|
tree
2017-10-18
Jun
i
o C Ham
a
no
Mer
g
e branch 'ar/request-pull-phrasofix' into m
a
int
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
M
erge branch 'jc/
m
erge-x-theirs-d
o
c
fix' into maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C Ham
a
no
Merge branch 'rs/mailinf
o
-
qp-dec
o
de-fix'
into ma
i
n
t
commit
|
commitdiff
|
tree
2017-10-18
J
u
nio
C
Hamano
Merge branch
'
ik/userdiff-ht
m
l-h
-
element-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Juni
o
C Hamano
Merge branch 'jk/diff-blob' into maint
commit
|
commitdiff
|
tree
2017-10-18
Juni
o
C Ham
a
no
Merge branch 'jk/de
s
c
rib
e
-omit-some-refs'
into maint
commit
|
commitdiff
|
tree
2017-10-18
Ju
n
io
C
Ha
m
an
o
M
erge b
r
anch 'mh/for-eac
h
-string-li
s
t-item-empty-fix
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Merge branch 'tb/test-lint-e
c
ho
-
e' into mai
n
t
commit
|
commitdiff
|
tree
2017-10-18
Ju
n
io C H
a
ma
n
o
M
erge branch 'aw/gc-lockfile-fscanf-f
i
x' into maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Mer
g
e
br
a
nch 'tg/refs-a
l
lowed-flags' into m
a
in
t
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Merge branch 'rs
/
archive-
e
xcluded-dir
e
ctory' into ma
i
nt
commit
|
commitdiff
|
tree
2017-10-18
J
u
nio C
Hamano
Mer
g
e branch
'
r
k
/commit-tree-mak
e
-F-verbatim
'
into
.
.
.
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Mer
g
e b
r
an
c
h 'mh/packed-ref-store-prep' i
n
to maint
commit
|
commitdiff
|
tree
2017-10-18
Junio C Haman
o
Merge b
r
anch 'mm/send-ema
i
l-cc-
c
ruft
'
into
m
a
int
commit
|
commitdiff
|
tree
2017-10-18
Junio
C Hamano
Mer
g
e b
r
an
c
h 'rs/s
t
rbuf-getwholelin
e
-fix' into mai
n
t
commit
|
commitdiff
|
tree
2017-10-18
Junio C Ha
m
ano
branch doc: sprinkle
a
f
ew commas
for readabi
l
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-18
Junio C Hamano
Prepari
n
g for
r
c2
continue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-18
J
u
nio C Ha
m
a
n
o
Me
r
ge
bra
n
ch 'jk/ref
-
f
i
lter-
c
olors-fix
'
commit
|
commitdiff
|
tree
2017-10-18
Juni
o
C Hamano
Merge
bran
c
h '
j
s/rebase
-
i
-final'
commit
|
commitdiff
|
tree
2017-10-18
D
a
vid G
l
a
sser
d
o
c: list filter-b
r
anch subdirectory-fi
l
ter f
i
rst
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
Ra
l
f Thielow
se
q
uencer
.
c: un
i
fy an error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
Ju
n
i
o
C Hamano
f
e
tch doc: src side of re
f
spec
c
ould be f
u
ll
S
HA-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
Jeff King
t
a
g: respect co
l
o
r
.
u
i
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
Jeff King
Revert "color: c
h
eck color
.
ui in gi
t
_
default
_
config
(
)"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
Jeff Kin
g
Revert
"
t6006: d
r
o
p
"always" color config tests"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
Jeff King
Rever
t
"colo
r
: make "al
w
a
y
s" the s
a
me as "auto" in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
J
unio C Hamano
Merge b
r
an
c
h 'jk/ui-
c
o
l
or
-
alway
s
-
t
o
-auto-maint' (
e
arly
.
.
.
commit
|
commitdiff
|
tree
2017-10-17
Junio C Hamano
Cr
a
wling towards -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-17
Junio C
Ham
a
no
Merg
e
b
r
a
nch 'sb/di
f
f-col
o
r-move
'
commit
|
commitdiff
|
tree
2017-10-17
J
u
nio C
Ha
m
an
o
Merge branch '
j
s
/rebase-i-final'
commit
|
commitdiff
|
tree
2017-10-17
Junio C Hamano
Merge branch 'jc/doc-c
h
eckout'
commit
|
commitdiff
|
tree
2017-10-16
Jeff King
dif
f
:
fix inf
i
nite loop with --co
l
or-moved --igno
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-16
Ralf Thi
e
low
sequencer
.
c:
f
i
x
a
n
d unify error messa
g
e
s in
r
earran
g
e_squas
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-10-12
W
.
Trevo
r
King
Docu
m
entat
i
on/merg
e
-op
t
ions
.
t
x
t: describe -S/--gpg
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next