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
Merge branch 'jk/make-fix-dependencies'
2015-04-29
Juni
o
C Hamano
me
r
ge: extract p
r
epare_m
e
rge_message() logic
o
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Ha
m
an
o
merge: narrow scop
e
of merge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o
C Hamano
merge: split r
e
duce_pare
n
ts() o
u
t of collec
t
_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hama
n
o
merge:
clarify collect_pa
r
ents
(
)
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C Hamano
m
e
rge: small leakfix
and
c
ode simpl
i
f
ication
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
merge: do not che
c
k a
r
gc to
determine number of re
m
o
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
m
e
rge: clarif
y
"
p
ull
i
ng into void" specia
l
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C H
a
man
o
t
5520: test
p
u
lli
n
g an octopus into an unborn
b
ranch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
mer
g
e:
simplif
y
code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
rg
e
:
t
e
s
t the top-level mer
g
e dr
i
ver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
test: val
i
d
a
te p
r
erequistes syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Hamano
Merge bra
n
ch 'mh/multima
i
l-renewa
l
'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Ham
a
no
Merge bra
n
ch 'mg/sh
o
w
-
notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Me
r
ge
branch '
n
d/v
e
rs
i
o
n
cmp-prer
e
le
a
s
e
s
'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C Hamano
Merg
e
branc
h
'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
Sy
n
c 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 Hama
n
o
Merge branc
h
'
tb/connect-ipv6-parse-fix
'
int
o
maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C H
a
m
a
no
Merge br
a
n
c
h
'
ma/bash-completion-lea
k
ing
-
x
' into maint
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Hamano
Me
r
g
e
branch 'jc/push-cer
t
'
into maint
commit
|
commitdiff
|
tree
2015-04-22
J
unio C Hama
n
o
ignore: info/
e
xclude should trump core
.
e
xcludesfile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
J
unio C Hamano
Git 2
.
4
.
0-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
S
y
n
c with
maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio
C Ham
a
no
Gi
t
2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
ano
M
e
rge
b
ran
c
h '
j
k/col
o
rs' i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
M
e
rge branch 'j
k
/test-annoya
n
c
e
s
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
ano
M
erge branch 'pt/enter
-
repo-com
m
ent-
f
ix'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
m
a
no
Merge branch 'jz
/
g
itweb-
c
onf-doc-fix' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
Me
r
ge bran
c
h 'jk
/
cher
r
y-pick-docfix' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
un
i
o C Hamano
Merg
e
branch
'iu/f
i
x-parse-optio
n
s
-
h-c
o
mment
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C H
a
ma
n
o
Merge br
a
nch
'
jg/cgui
d
e
-
we-
c
annot-
c
ount' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hama
n
o
Merge
branch 'jk/pack-corruption-post-mortem'
int
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ham
a
no
Merge branch 'jn/doc-f
a
st-imp
o
r
t-no-16
-
octopus
-
limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
RelNote
s
:
"merg
e
--quiet" c
h
ange has been rever
t
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Hamano
Hopefully the las
t
b
atch for 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Mer
g
e branch 'ps/grep-he
l
p-al
l
-c
a
ll
b
ack
-
arg'
commit
|
commitdiff
|
tree
2015-04-20
Jun
i
o C
H
a
m
a
n
o
Merge branch 'tb
/
connect-ipv6-parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
M
erge
b
r
a
nch 'va/fi
x
-git-p4-tests
'
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio C Hamano
Merge branc
h
'jc
/
pu
s
h-cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Hamano
Merge branch
'ma/bash-comple
t
ion-leaki
n
g-x'
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio C
H
amano
fmt-merge-msg
:
plug small l
e
a
k
of co
m
mit buffe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
Jun
i
o C Ha
m
an
o
Merge tag
'git
g
ui-0
.
20
.
0' of http
:
//r
e
po
.
or
.
cz/r/git
-
gui
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
Ham
a
no
a
tt
r
: skip UTF8
B
O
M at
t
he beginning of the i
n
put file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Juni
o
C Hamano
config: use utf8
_
bo
m
[]
f
rom
utf
.
[ch] in
g
i
t
_p
a
rse_so
u
rce()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Ju
n
io C Hamano
utf8-bom: introduce skip_u
t
f8_bo
m
(
)
h
e
lper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C H
a
mano
add_
e
xclude
s
_from
_
file: clarify
the bo
m
s
k
ipping logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Ju
n
io C Hamano
Revert "merge: pass verbosity f
l
ag
d
own
t
o
merge-recursive"
commit
|
commitdiff
|
tree
2015-04-15
Jun
i
o C
H
amano
parse_date_ba
s
i
c():
le
t
the system handle D
S
T conver
s
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Jun
i
o C
Hamano
parse_date
_
basic(): return early when given a bog
u
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ha
m
a
n
o
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
r
ge b
r
anch 'jk/colors'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hamano
Me
r
ge
b
ranch 'j
k
/me
r
ge-q
u
iet'
commit
|
commitdiff
|
tree
2015-04-14
J
unio C Hamano
M
erge
b
ranc
h
'jk/pa
c
k-corrupt
i
on-post-mortem'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hama
n
o
Merge branch 'jc/upd
a
t
e-instead-into-void'
commit
|
commitdiff
|
tree
2015-04-14
J
u
n
i
o C Hamano
Merge branch 'sb/plug-s
t
rea
m
in
g
-
leak'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hamano
M
erge b
r
anch 'jn/d
o
c-fas
t
-import
-
no-1
6
-oc
t
opus-li
m
i
t
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Haman
o
Merge branch 's
b
/plug-wt-shortstatus-trackin
g
-
l
e
ak'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Haman
o
Merge b
r
a
n
ch 'pt/enter-repo-comm
e
nt-
f
ix'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Haman
o
Merge bran
c
h 'jz/gitweb-conf-doc-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C H
a
m
a
no
Mer
g
e br
a
nc
h
'
jk/cherry-pick-do
c
fi
x
'
commit
|
commitdiff
|
tree
2015-04-14
J
unio
C Hamano
Merge branch '
i
u/fix-parse-optio
n
s-h-comment'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Hamano
Merge b
r
a
nch
'jg/cgu
i
de-we-ca
n
n
o
t-count'
commit
|
commitdiff
|
tree
2015-04-09
Jun
i
o
C
Hamano
Me
r
ge tag 'l10n-2
.
4
.
0
-
rnd
2
' of
git:/
/
github
.
com
/
git
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Junio C
Haman
o
Git 2
.
4
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
J
u
n
io C Hamano
M
er
g
e branch 'sb
/
atomic-push'
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
pu
s
h --s
i
gned: tighten wh
a
t th
e
r
e
ceivin
g
end
can ask
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Juni
o
C
H
amano
pus
h
-to-d
e
ploy: allow pushin
g
into an unborn br
a
nch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Junio
C
Hamano
Sync w
i
t
h 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hama
n
o
Git 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Junio
C
Hamano
Merge bran
c
h 'ss/pull-rebase-preserve' int
o
maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Haman
o
Merge branch '
j
c/rep
o
rt-path-error-to-d
i
r'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hama
n
o
Merge bran
c
h 'ph/
p
us
h
-
d
o
c
-
c
as' into main
t
commit
|
commitdiff
|
tree
2015-03-28
Junio
C Hamano
Sync
w
ith main
t
commit
|
commitdiff
|
tree
2015-03-28
J
u
n
io C Hamano
Re
l
Notes: minor d
o
c updates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hamano
Merge branch 'ph/push
-
doc-cas'
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Hama
n
o
Merge
b
ranch 'ss/p
u
ll
-
rebase-pre
s
e
rv
e
'
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o
C
Hamano
Prepare f
o
r 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Mer
g
e branch 'sg/comp
l
e
tion-git
c
omp-nl-for-refs'
into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Me
r
ge
branch 'jk/simplif
y
-csum-fi
l
e-sha1fd-check' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hama
n
o
M
e
rge
b
ranch '
t
g/t
e
s
t
-index-v4'
into m
a
int
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Ham
a
no
Merg
e
branc
h
'nd/doc-git
-
index
-
v
e
rsion' into maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Ham
a
no
Mer
g
e branch '
c
t/pr
o
mpt-
u
ntracked-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
M
e
rge br
a
n
c
h 'ws/grep-
q
uie
t
-n
o
-pager' into
maint
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
M
e
r
ge
branch 'jc
/
s
ubm
i
tti
n
g-patches-menti
o
n-send-em
a
il
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branch 'j
k
/cleanup-failed-
c
lone' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
J
un
i
o C Hamano
Merge bra
n
ch 'j
k
/
f
et
c
h-pack' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
Merge bra
n
ch 't
g
/fix-check-order-with-split-inde
x
'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge bran
c
h 'jk/pru
n
e-with-corrupt-refs' into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge b
r
anch 'jn/doc-api-errors'
commit
|
commitdiff
|
tree
2015-03-27
J
u
n
io C Ha
m
ano
Syn
c
w
it
h
ma
i
nt
commit
|
commitdiff
|
tree
2015-03-27
Junio C Ham
a
no
Merge bra
n
c
h 'sb/lea
k
s'
commit
|
commitdiff
|
tree
2015-03-27
Junio C
Hamano
Merge branch 'jk/tag-h-
c
olumn-is
-
a-l
i
st
i
ng-option'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
Merg
e
b
r
anch 'jk
/
smart-http-hide-refs'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-03-27
J
uni
o
C Hama
n
o
Merge branc
h
'
js/completi
o
n-ctag
s
-pattern-
s
u
b
sti
t
ut
i
on
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Juni
o
C H
a
m
ano
Updat
e
ma
i
lmap to
spel
l
ou
t
"Alexander Kule
s
hov"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Junio
C Hamano
diff
-
no-
i
ndex: alig
n
D/F handl
i
ng with that of norma
l
Git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Junio C Hamano
Git 2
.
4
.
0-r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Junio
C Hamano
M
er
g
e branch 'jk/test-chain-lint'
commit
|
commitdiff
|
tree
2015-03-26
Ju
n
io C Hamano
M
e
rg
e
branch 'sg/
c
o
m
pletion-gitcomp-nl-for-ref
s
'
commit
|
commitdiff
|
tree
next