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 'pt/pull-tags-error-diag'
2015-04-29
Junio C Haman
o
merge:
d
epr
e
c
a
te 'git merge <message> H
E
AD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
mano
merge: handle FETC
H
_HEAD inter
n
ally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C Hamano
merge: deci
d
e if w
e
aut
o
-gen
e
rate the message e
a
rly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
m
e
rge: make co
l
lect_parents() au
t
o
-
generate the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
m
e
r
g
e
:
extrac
t
prepa
r
e_m
e
r
ge_message() lo
g
ic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hama
n
o
merge: narrow scope of merge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Haman
o
merge: split re
d
uce_par
e
nt
s
(
) out of col
l
ect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
merge: clarify co
l
lect
_
parents()
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Hamano
m
e
rge
:
small leakfix
a
n
d
code simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
mano
merge: do no
t
c
h
eck a
r
g
c
to
de
t
ermine nu
m
ber of
r
emot
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Ha
m
a
no
merge: clarify "pulling into voi
d
"
special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
t55
2
0:
t
e
st
pu
l
ling an octopus into an u
n
b
o
r
n branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
t
5
520: st
y
le fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C
Hamano
merge:
s
implify c
o
de flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
m
a
n
o
me
r
ge: test t
h
e top-
l
evel m
e
r
g
e
dri
v
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
test: va
l
idate prer
e
q
uistes sy
n
tax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C Haman
o
Mer
g
e branch 'mh/multim
a
il-renew
a
l'
commit
|
commitdiff
|
tree
2015-04-28
J
un
i
o C
Hamano
M
er
g
e branch 'mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merg
e
branch 'nd
/
v
e
rsio
n
cmp
-
pr
e
r
elea
s
es'
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C Ham
a
no
Merge branch 'mg/status
-
v
-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Sy
n
c wit
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C
Ham
a
n
o
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Hamano
M
erge branch
'tb/conn
e
ct-ip
v
6-par
s
e-fix' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Hamano
Mer
g
e
b
ranch 'm
a
/bash-completion-le
a
ki
n
g-x' into main
t
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Hamano
Merge branch 'jc
/
push-
c
ert' into
maint
commit
|
commitdiff
|
tree
2015-04-22
J
u
nio
C H
a
mano
ignore: info/excl
u
de should trump
c
ore
.
e
xclude
s
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
Ju
n
io C Ham
a
no
Git 2
.
4
.
0
-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Ham
a
no
Sync
with
ma
i
nt
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
Jun
i
o
C Hamano
M
erge
b
r
anch 'jk/colors'
into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
amano
Merge branch 'jk/
t
e
st-annoyances' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merge bra
n
ch 'pt/
e
nter-repo-co
m
m
e
nt-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merg
e
br
a
nch
'
jz/gitweb-c
o
nf
-
doc-
f
ix' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hamano
Merge branch 'jk/
c
herry-pick
-
docf
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branc
h
'iu/fix-parse-options-h-comment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io
C
Hamano
Merge br
a
nch 'jg/cgu
i
de-we-canno
t
-count' into main
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
a
n
o
M
e
r
ge branch
'jk/pack-corruption-post-mo
r
tem'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'j
n
/doc-fas
t
-im
p
ort-n
o
-1
6
-octopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
RelNotes: "me
r
ge --quiet" change
h
a
s
been rev
e
rted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
J
unio C Ha
m
ano
Ho
p
efu
l
ly the
la
s
t
ba
t
ch
f
or
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio C Hamano
M
erge branch 'ps/grep-help-all-call
b
a
c
k-arg'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Hamano
Merge branch '
t
b/connect-ipv6-parse-f
i
x'
commit
|
commitdiff
|
tree
2015-04-20
Jun
i
o C Hamano
Merge branch
'
va/f
i
x-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio
C Hama
n
o
M
e
rge branch 'j
c
/pu
s
h-
c
er
t
'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C
Ham
a
no
Merge
b
ranch 'ma/bash-
c
ompletion-leaking-x
'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C
Hama
n
o
fmt-me
r
g
e-msg: plu
g
small le
a
k of commit buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
J
u
nio C Ham
a
no
Me
r
ge
t
ag 'gitgui-
0
.
20
.
0
'
of http://repo
.
or
.
c
z/
r
/
g
it-gui
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o C Hama
n
o
attr: skip UTF8
B
OM at the beginning
o
f
t
he i
n
pu
t
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
H
amano
c
onfig: use utf
8
_bom[]
fro
m
utf
.
[ch] in
git_pars
e
_source()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
Ha
m
ano
utf8-bom: intr
o
duce
s
kip_utf8_bom()
h
e
l
per
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o C Ham
a
no
add_exclude
s
_from_file: clarif
y
t
h
e bom skipp
i
ng logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Ha
m
ano
Revert "merge: pass verbo
s
ity flag down t
o
m
erge-recursiv
e
"
commit
|
commitdiff
|
tree
2015-04-15
Juni
o
C Hamano
parse_d
a
te
_
basic(): let
t
h
e
system handle
D
ST conversio
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 earl
y
when given a bogus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Junio C H
a
mano
Git 2
.
4
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C
H
amano
Merge branch 'jk/colo
r
s'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge
bran
c
h
'jk/merge-quiet'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'jk/pack-corruption-post-mortem
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'jc/update-instead-into-void'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
am
a
n
o
Merge branc
h
'sb/plug-streaming-
l
eak'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Hamano
Merge branc
h
'j
n
/doc-fast-i
m
por
t
-no-16-octopus
-
limit'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch
'sb
/
plug-wt
-
shortstatus-tracking-le
a
k'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C H
a
m
ano
Merg
e
b
ran
c
h 'pt/enter-repo-comment-fi
x
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'jz/gitweb-
c
onf-doc-fix
'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io
C Haman
o
Me
r
ge branch '
j
k/cher
r
y-pick-doc
f
i
x'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C Hamano
Merge
branch 'i
u
/fix-parse-options-
h
-
comment'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'j
g
/
c
guide-we-cannot-count'
commit
|
commitdiff
|
tree
2015-04-09
Juni
o
C
Haman
o
Merge tag
'
l10n-2
.
4
.
0-rnd2
'
of git://gi
t
hub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
J
u
nio 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
a
mano
Merge bran
c
h
'
sb/atomic-pu
s
h'
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
pu
s
h
--signe
d
:
tight
e
n what the
r
e
c
e
i
v
i
ng end can ask
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Ham
a
no
push-to-
d
eploy: allo
w
pushing into an unborn
branc
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Jun
i
o
C Hamano
Sync with 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
i
o C Hamano
G
i
t 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Junio C
H
aman
o
Merge branch 'ss/pul
l
-reb
a
se-preserve' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C Hama
n
o
Merg
e
b
ranch '
j
c/
r
eport-path-err
o
r-to-dir' into
maint
commit
|
commitdiff
|
tree
2015-03-31
Jun
i
o
C Hamano
Mer
g
e branch 'p
h
/p
u
s
h-
d
oc-cas' into
m
aint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2015-03-28
Junio
C Ham
a
no
RelNotes: m
i
nor doc up
d
ates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
M
e
r
g
e bran
c
h 'ph/push
-
doc-cas'
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
Merge
b
r
a
nch
'
ss/pull-r
e
base-
p
reserve
'
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Hamano
Pr
e
pare for
2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Hamano
Merge bra
n
ch '
s
g/completion-gitc
o
mp-nl-for-re
f
s' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
Merge b
r
anch
'jk/simplify-c
s
um-file-s
h
a1fd-check' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge br
a
nch
'
t
g
/tes
t
-ind
e
x-
v
4' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
an
o
Merge branch
'
n
d/doc-gi
t
-index-version' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Ha
m
ano
Merge branc
h
'ct/pr
o
mpt-untr
a
cked-fix' into maint
commit
|
commitdiff
|
tree
2015-03-28
J
un
i
o C Hamano
Merge branch 'ws/gre
p
-
q
u
iet-no-pager' into maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
i
o
C
Hamano
Merge branc
h
'
jc/submitting-patc
h
e
s
-menti
o
n-s
e
nd-em
a
il
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Haman
o
Merge branch
'
jk/clean
u
p
-
failed-clone' into m
a
int
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
M
e
rge
branch
'
j
k
/fetch-pa
c
k' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
J
u
n
io C
H
aman
o
M
erge branc
h
'tg/fix
-
check-order
-
with-
s
p
l
it-index'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge b
r
anch 'jk/p
r
une-with-
c
orrupt-refs'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
Merg
e
b
ranch 'jn/doc-api
-
error
s
'
commit
|
commitdiff
|
tree
2015-03-27
Ju
n
io C Hamano
Sy
n
c with maint
commit
|
commitdiff
|
tree
2015-03-27
Juni
o
C
Hamano
Merge branch '
s
b/leaks'
commit
|
commitdiff
|
tree
2015-03-27
Junio C Ha
m
an
o
Merge branch 'jk/tag-h-col
u
mn-is-a-listing-option'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Juni
o
C Hama
n
o
Merge bran
c
h 'jk/s
m
ar
t
-ht
t
p
-h
i
de
-
refs' into maint
commit
|
commitdiff
|
tree
2015-03-27
Ju
n
io
C
Hamano
Merge br
a
nc
h
'js/completion-ctags
-
pattern-sub
s
titut
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C
H
a
m
ano
Update m
a
ilmap to spell o
u
t "Alexander Kules
h
o
v
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next