repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
submodule: rewrite to take an object_id argument
2015-05-06
Junio
C
Ha
m
a
no
Mer
g
e br
a
nch 'jk/ini
t
-core-worktree-at-root
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merg
e
branch 'mh/s
h
ow-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Haman
o
M
e
rge branch 's
b
/lin
e
-log-plug-pairdiff-l
e
ak'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C
Ha
m
ano
Merge bra
n
ch 'jc/diff-no-inde
x
-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Me
r
ge
b
ranch
'
bc
/
object-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio
C
Hamano
daemon: unbreak NO_
I
PV
6
build regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
write_sha1_fi
l
e():
d
o not use a separa
t
e sha1[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: deprecate 'git merge
<message> HEAD
<commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
mano
merge: handl
e
F
E
TCH_HEAD inte
r
nal
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
am
a
n
o
merge: decide if
we
a
uto-generate the messa
g
e ear
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: make
c
ol
l
ect_paren
t
s() auto-ge
n
erat
e
t
h
e merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merge:
extract prepare_merge
_
messa
g
e(
)
lo
g
ic ou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merg
e
: narrow scope of
m
erge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e
:
spl
i
t re
d
uce_parents() out of colle
c
t
_
parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: c
l
arify collect
_
pare
n
ts() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
ni
o
C Hamano
merge: small leakfix an
d
co
d
e simplification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: do not check
argc
to determine numb
e
r of r
e
mo
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C
Hamano
mer
g
e: clarif
y
"p
u
l
l
in
g
into vo
i
d" special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5
5
20: t
e
st
pulling
an octopus into an
u
nborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
t5520: style fi
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hama
n
o
m
e
rge
:
simplify co
d
e flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge:
test the top-lev
e
l merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
un
i
o C Ham
a
no
test:
va
l
idate prerequ
i
s
tes syn
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch 'mh/multimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
J
unio C Hamano
Me
r
g
e
bra
n
ch
'
m
g
/sho
w
-notes-do
c
'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C
Ham
a
n
o
Merge bran
c
h 'nd
/
vers
i
o
ncmp
-
prerelease
s
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch 'mg/sta
t
us-v-
v
'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
Sync wi
t
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Hamano
G
it 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
J
u
ni
o
C Hamano
Merge br
a
nch 'tb/con
n
ect-ipv6-
p
a
r
se-fix'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
i
o C Hamano
Mer
g
e bran
c
h 'ma/bash-com
p
letion-lea
k
ing-x' into
maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C
H
amano
M
erge branch
'
jc/push-cer
t
' int
o
maint
commit
|
commitdiff
|
tree
2015-04-22
Jun
i
o C
H
a
m
ano
ig
n
ore: in
f
o/exclude
s
houl
d
trump core
.
ex
c
ludesfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio C
H
amano
Git
2
.
4
.
0
-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio
C
H
a
mano
Sync with m
a
int
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Git
2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Mer
g
e branch 'jk/col
o
rs' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio
C
Haman
o
Me
r
ge br
a
nch
'jk/test-an
n
oyances'
i
nto maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge branch 'pt/enter-re
p
o-com
m
ent-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge
b
r
anch
'j
z
/gitweb-conf-doc-fix' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
e
rge branch 'jk/cherry-p
i
ck-docfix' into
m
ain
t
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
i
o C Hamano
Merge branch
'iu/
f
i
x-parse-options-h-comment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C
Hamano
Mer
g
e
bran
c
h 'jg/c
g
uide-we-cannot-
c
ount' into maint
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Mer
g
e branch
'
j
k
/pac
k
-
c
o
rruption-post-mo
r
tem' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Haman
o
Mer
g
e br
a
nch
'jn/doc-fast-import-no-16-oct
o
pu
s
-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
a
mano
Rel
N
o
t
es: "
m
erge --quiet" change
has been rev
e
r
t
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
J
unio
C
H
a
mano
Hopefully
the last
ba
t
ch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ham
a
no
M
e
rge branch 'ps/
g
rep-help-all-callba
c
k-arg'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Mer
g
e branch 'tb/connect-ipv6-p
a
rse-fix'
commit
|
commitdiff
|
tree
2015-04-20
J
u
n
io C Hamano
M
erg
e
branch 'va
/
fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge branch
'jc/push-cer
t
'
commit
|
commitdiff
|
tree
2015-04-20
Jun
i
o C Hamano
Merge branch 'ma/bash-
c
ompletion-lea
k
in
g
-x'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ha
m
a
n
o
fmt-
m
erge-msg: plug small leak of commi
t
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
J
unio C Hamano
Merge ta
g
'gitgui-0
.
20
.
0
' of
h
ttp://repo
.
or
.
cz/r/g
i
t-gui
commit
|
commitdiff
|
tree
2015-04-16
J
unio C Hama
n
o
attr: skip U
T
F8 BOM at
the beginni
n
g
o
f the input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o C Ham
a
no
config: us
e
ut
f
8_bom[] from
u
tf
.
[ch] in
gi
t
_parse_source()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o C
H
amano
u
tf8-bo
m
: int
r
o
duce
s
k
i
p_
u
tf8_b
o
m() h
e
lper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
Hamano
add_excludes_fr
o
m
_file: cl
a
rify the bom ski
p
p
i
ng logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
u
nio C Ha
m
a
n
o
Revert "merge: pass verbos
i
ty
fl
a
g
down to merge
-
re
c
ursive"
commit
|
commitdiff
|
tree
2015-04-15
Juni
o
C
H
amano
parse
_
dat
e
_bas
i
c
(
)
: let the sys
t
em
handl
e
DST convers
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hamano
parse_da
t
e_basic(): return early when
gi
v
en a bogus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o C Ham
a
n
o
Git
2
.
4
.
0-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
J
u
ni
o
C Hamano
Merge branch 'jk/colors'
commit
|
commitdiff
|
tree
2015-04-14
Junio C H
a
mano
Merge branch
'jk/merg
e
-quiet'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C Hamano
Merge
br
a
nch 'jk
/
pack-cor
r
uption-post-mor
t
em'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
a
m
ano
Merge branch 'jc/
u
pda
t
e-instead-into-void'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Ha
m
ano
Merge branch 's
b
/plug-streamin
g
-
l
eak'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
i
o
C H
a
m
ano
M
erg
e
branch 'jn
/
doc-fast
-
import-no-16-o
c
topus-limit'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge br
a
nch 'sb/p
l
ug-wt-shortst
a
tus-tracking-leak
'
commit
|
commitdiff
|
tree
2015-04-14
J
unio C Hamano
M
erge
branc
h
'pt/en
t
er-repo
-
comment-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Hamano
M
e
rge branch 'jz/gitweb-con
f
-doc
-
fix'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C
H
amano
Merge
b
r
a
n
ch 'jk/che
r
ry-
p
ick-docf
i
x'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
ama
n
o
M
e
rge b
r
anch 'iu/fix-par
s
e-opt
i
ons-h-comme
n
t'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'jg/cguide-we-can
n
ot-count'
commit
|
commitdiff
|
tree
2015-04-09
Junio C Hamano
Merge tag
'
l1
0
n
-
2
.
4
.
0-rnd2' of git://gith
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Ju
n
io C H
a
mano
Git 2
.
4
.
0-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
Merge branc
h
'sb/atomic-p
u
sh'
commit
|
commitdiff
|
tree
2015-04-02
Junio C
Hamano
pu
s
h --sign
e
d: tighte
n
w
h
a
t
the receiving
e
nd can ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hama
n
o
p
ush
-
to-
d
e
p
loy:
a
llo
w
p
ushing i
n
to an unb
o
rn branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Jun
i
o C H
a
mano
Sync with 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
J
u
nio C Hamano
Git
2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C Haman
o
Merge bran
c
h 's
s
/pull-r
e
base-preserve'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-03-31
Jun
i
o
C Hamano
Merge branch '
j
c/re
p
ort-
p
ath-error
-
to-dir' into m
a
int
commit
|
commitdiff
|
tree
2015-03-31
Junio C
H
a
m
an
o
M
e
r
ge b
r
anch 'ph/push-doc-cas' into m
a
in
t
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Ha
m
ano
Sync wi
t
h maint
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Haman
o
RelNotes: mi
n
or doc
u
pdates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C
Ha
m
ano
Merge
b
r
anch 'ph/push-doc-cas'
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Ham
a
n
o
Me
r
ge branch 'ss/pu
l
l-rebase-preserve'
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Ha
m
ano
Prepa
r
e for
2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
Merge br
a
nch 'sg/completion-gitcom
p
-nl
-
for-refs'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o
C Hamano
M
e
rge branch 'j
k
/si
m
pli
f
y-csum-file-sha1f
d
-check' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C H
a
mano
Merge branch 'tg/test-
i
ndex-v4'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Haman
o
Me
r
ge bran
c
h
'nd/d
o
c-git-in
d
ex-version' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
b
ranch 'c
t
/
p
rompt-untracked-fix' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
a
m
an
o
Mer
g
e branch 'ws
/
grep-quiet-
n
o
-
p
ager'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Haman
o
Merge
bra
n
ch 'jc
/
sub
m
itting-patches-men
t
ion-send
-
ema
i
l
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hama
n
o
Merge br
a
nch 'jk/cleanup-failed-clone' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
Merge branch
'
j
k/fetch-pack' int
o
maint
commit
|
commitdiff
|
tree
2015-03-28
Junio
C Hamano
Merge br
a
n
c
h 'tg/
f
i
x
-check-order-wi
t
h
-split-in
d
ex'
.
.
.
commit
|
commitdiff
|
tree
next