repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pt/pull-log-n'
2015-05-06
Junio C H
a
man
o
Merge bra
n
ch 'ld/p4
-
filetype-detection'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Haman
o
Merge
br
a
nch 'ts/
c
h
eckout-advice-plur
a
l'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'jk/ini
t
-core-work
t
ree-at-root
'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge br
a
nch 'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
am
a
no
Merge branch
's
b
/li
n
e-log-plug-pairdi
f
f-leak'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C Ha
m
ano
Merge branch 'jc/diff-no-ind
e
x-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'bc/object-
i
d'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
da
e
mon
:
unbr
e
ak NO
_
IPV6 build regres
s
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o
C Ham
a
n
o
write_sha1_file()
:
do n
o
t use
a
separ
a
te 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
Ju
n
io C H
a
ma
n
o
m
e
rge: de
p
recate 'g
i
t merge <message> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
n
o
me
r
ge: ha
n
dle FETCH_HEA
D
intern
a
lly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
mer
g
e:
d
ec
i
de if we auto-generate the message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
H
ama
n
o
merg
e
: m
a
k
e
collect_parents()
auto-generate th
e
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: extract p
r
epare_m
e
rge_
m
essage() l
o
gic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge
:
narrow sco
p
e of
merge_n
a
me
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: spl
i
t r
e
duce_p
a
rents()
o
ut
of colle
c
t_
p
arents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
Ha
m
ano
merge: cla
r
ify
c
ollect_parents()
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
man
o
merge: sm
a
ll leakfix and code simpl
i
f
ication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
m
e
rg
e
:
d
o not check
a
rgc to determine
number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
er
g
e
: clarify "pulling into void"
special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
t5520: test pulling an octopus into an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5
5
20: style
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hamano
mer
g
e: simplify c
o
de flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merge
:
test the top-lev
e
l m
e
r
ge driv
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C
H
ama
n
o
test: validate prerequistes syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
unio C
H
aman
o
M
e
rge
b
r
a
nch 'mh/multimail
-
ren
e
wal'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C
H
a
mano
M
e
rge bra
n
ch 'mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
amano
Merge
branch 'nd/versioncmp-prerele
a
ses'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
amano
Merg
e
br
a
nch 'mg/st
a
tus-
v
-v'
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Hamano
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio
C Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hamano
Merge b
r
a
n
ch 'tb/co
n
nect-ipv6
-
parse-fix' into
maint
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C
H
amano
Merge bran
c
h 'ma/bash
-
completio
n
-leaking-x'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge b
r
anc
h
'jc/push-cert' into maint
commit
|
commitdiff
|
tree
2015-04-22
Junio C Ha
m
ano
ig
n
ore: inf
o
/
ex
c
lude should
t
rump core
.
excl
u
desfil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Ju
n
io
C Hamano
Git 2
.
4
.
0
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio
C Hama
n
o
Sync with maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Git
2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge br
a
nch 'jk/
c
olors'
into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merge branc
h
'jk
/
tes
t
-an
n
oyances'
into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Merge bran
c
h '
p
t/enter-r
e
po-
c
omm
e
n
t
-fix' int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
e
rge branc
h
'jz/g
i
tweb
-
conf-doc-f
i
x' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
i
o C Hamano
Me
r
ge branch 'jk/cherry-
p
ic
k
-d
o
cfix' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hamano
Mer
g
e
b
ranch 'iu/fix-parse-option
s
-h-commen
t
' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
ano
Merge branch
'jg/cguide-we
-
cannot-count'
i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hama
n
o
Merge b
r
anch
'
jk
/
pa
c
k-corruption-post
-
mortem
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io
C
Hamano
Me
r
ge
branch '
j
n
/doc-fast-imp
o
rt-
n
o-16-
o
c
t
op
u
s-l
i
mit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
RelNotes:
"
merge --quiet" change
h
a
s been re
v
e
r
t
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
amano
Hopefully the last batch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Ha
m
ano
Merge branch 'ps/grep-help-all-callback-arg'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
M
e
rge branch 'tb/connect-ipv
6
-
p
arse-fix
'
commit
|
commitdiff
|
tree
2015-04-20
Jun
i
o
C
H
a
mano
Merge br
a
nch 'va/f
i
x-g
i
t
-
p
4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
Hamano
Merge
b
ran
c
h
'
jc/push-ce
r
t'
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio
C Hamano
M
erge branch 'ma/bash-completion-leaking
-
x'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
fm
t
-merge-ms
g
: pl
u
g
small leak of co
m
mit buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Ham
a
n
o
Merge tag 'gitgui-0
.
20
.
0' o
f
htt
p
://repo
.
or
.
cz/r/git-gu
i
commit
|
commitdiff
|
tree
2015-04-16
J
u
n
io C Hamano
att
r
: s
k
ip UTF8
B
OM a
t
t
he beginnin
g
o
f the input fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Ju
n
i
o C H
a
mano
con
f
i
g: us
e
utf8_bom[] from utf
.
[ch]
i
n
git_parse_source()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
H
aman
o
u
t
f8-bom: introduce s
k
ip_u
t
f8
_
bom() he
l
per
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Ju
n
i
o
C Ham
a
no
add_excludes_from
_
fil
e
: clarify the
b
om
s
kipping logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
Revert
"m
e
rge: pass verb
o
sity
flag down to merge-
r
ecursive"
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hamano
parse_date_ba
s
ic(
)
: le
t
the system
h
andle DST conver
s
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
J
unio C Hamano
p
a
r
se_d
a
te_ba
s
ic(): ret
u
rn ear
l
y when giv
e
n a
bog
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Git
2
.
4
.
0
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
M
e
rge branch 'j
k
/
c
olors'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io
C Ha
m
ano
Merge branc
h
'jk/merge-q
u
iet'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ha
m
a
no
M
er
g
e branch '
j
k/pack-corruptio
n
-post-m
o
rtem'
commit
|
commitdiff
|
tree
2015-04-14
J
u
n
io C Hamano
Merge branch 'j
c
/
u
pdate-instead-into-void
'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hamano
Merge branch 'sb/plug
-
st
r
e
aming-lea
k
'
commit
|
commitdiff
|
tree
2015-04-14
J
unio
C Hamano
M
e
rge branch 'jn
/
doc-fast-import-no-16-octo
p
us-limi
t
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
a
mano
Merge bra
n
ch 'sb/plug-wt-
s
hor
t
status-tracki
n
g-leak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ha
m
an
o
M
e
rg
e
branch 'pt/en
t
er
-
r
epo-co
m
men
t
-fix
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
Hamano
Mer
g
e branch 'jz/
g
itweb-conf-
d
oc-f
i
x'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
Hamano
Merge branch 'jk/
c
h
e
rry-pick-docfix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hama
n
o
Merge
b
ranch 'iu/fix-parse-o
p
tion
s
-h-comment'
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o
C Hamano
Mer
g
e branch 'jg/cguide-we-can
n
ot
-
count
'
commit
|
commitdiff
|
tree
2015-04-09
Junio C Hamano
M
e
rge tag 'l10n-2
.
4
.
0-rnd2'
o
f git://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Junio
C
Hamano
Git 2
.
4
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C
H
amano
M
erge branch 'sb/at
o
mic-push'
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
p
u
sh --signe
d
: tighten w
h
at t
h
e
r
eceiving end can ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
push-to-deploy: al
l
ow pushing into an unborn br
a
nch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
J
unio C Haman
o
Sy
n
c
with 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
J
u
n
io C Hamano
Git 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
J
unio
C Hamano
M
e
rge branch 's
s
/
p
u
l
l-re
b
ase-prese
r
ve' into maint
commit
|
commitdiff
|
tree
2015-03-31
J
uni
o
C Hamano
Merge branch 'jc/report-path-er
r
o
r
-to-dir
'
into maint
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C Hamano
Merge branch 'ph/push-doc-cas' into maint
commit
|
commitdiff
|
tree
2015-03-28
J
u
ni
o
C Hamano
Sync
w
ith
m
aint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
RelNo
t
es: mino
r
doc u
p
dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
a
mano
Merge branch 'ph
/
pus
h
-do
c
-
cas'
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Mer
g
e b
r
anch
'ss/pull-reb
a
se-pre
s
er
v
e'
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
P
repare for 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio
C Hamano
Merge branch
'
sg/compl
e
tion-gitcomp-nl-for-refs' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
Mer
g
e
b
r
anch 'jk/simpli
f
y-csum-file-sha1f
d
-chec
k
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
M
e
r
g
e branch 'tg/test-
i
ndex-v
4
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hama
n
o
Mer
g
e
b
ranch
'nd/doc-git-i
n
dex-version
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
ama
n
o
Merge branch 'ct/prom
p
t-untracked-
f
ix' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
branch 'ws/grep-quiet-no-pager' into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merg
e
br
a
n
c
h 'jc/submitting-patches-mention-se
n
d-email
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Ha
m
a
no
Me
r
ge
b
ranch 'jk/cleanu
p
-fai
l
ed-clone' into
m
aint
commit
|
commitdiff
|
tree
next