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
t5520: test for failure if index has unresolved entries
2015-04-29
Juni
o
C
Hamano
merge:
d
eprecate '
g
it m
e
rge <
m
essage>
HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merge: handle FETC
H
_HEAD in
t
ern
a
l
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
d
eci
d
e if we a
u
to-generate
the message
early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
m
erge: make co
l
le
c
t_p
a
rents()
aut
o
-gen
e
r
a
te the me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
H
am
a
no
m
erge: extract prepare_merge_message
(
) logic
ou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
mano
merge: na
r
row scope of merge_n
a
me
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
mano
merge:
s
plit reduce_p
a
r
e
nts() out of collect_pa
r
ents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
m
erge: clarify
collect_par
e
nts() lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
mer
g
e:
s
m
a
l
l leakfix and code s
i
mpl
i
fication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge
:
do
not check argc to determine
number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
mer
g
e
: clarify "p
u
lling into void"
speci
a
l
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
t5520:
t
e
st pulling an octop
u
s
int
o
an
u
nborn
b
r
a
n
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t55
2
0: style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
merge
:
simplify co
d
e flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: test the top-
l
e
v
el merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C H
a
mano
Git
2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
M
e
rge branch '
j
k/read-pa
c
ke
d
-re
f
s-without-
p
a
th-m
a
x
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Haman
o
Merge branch
'
mg
/
a
d
d
-ignore-er
r
o
r
s' into
m
aint
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C
Ha
m
ano
Merge
b
r
anch 'mh/
f
ind-
u
n
iq-abbrev'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
M
e
r
g
e
branc
h
'
jk/
a
pproxidate-avoid-y-d-m
-
over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge b
r
an
c
h
'
rw
/
apply-does-not-take-ignore-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io
C
Hamano
Merge branch 'jk/for-each-refl
o
g-ent-
r
ev
e
rse' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C Hama
n
o
Me
r
ge branch 'ma
i
nt-2
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
aman
o
Merge branch 'maint-2
.
0' i
n
to maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
M
erge
branch 'maint-1
.
9
'
into maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
io
C
H
amano
Merge branch 'maint-1
.
8
.
5' into main
t
-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ha
m
ano
M
e
r
ge branch
'
jk/dotgit-case-maint-
1
.
8
.
5' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o
C Hamano
Prepare for 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge bra
n
ch 'jk/rebuild-
p
e
r
l-scripts-with-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio
C
H
amano
Merg
e
branch 'jk
/
no-perl-
t
ests' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Haman
o
Merge branch 'po/everyday-
d
oc' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
io
C Hamano
Mer
g
e branch 'jk/pu
s
h-si
m
ple' into
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Me
r
ge branch 'm
h
/con
f
ig-f
l
ip-xbit-back-after-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
i
o C Hamano
Merge b
r
anch 'jk/gitweb-with-ne
w
er-cgi-multi-p
a
ram
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Me
r
ge branch 'rs/receive-pack-u
s
e-labs
'
into
mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merg
e
bran
c
h 'rs/ma
i
nt-con
f
ig-use-labs' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
io C Hamano
Merge br
a
n
c
h 'js/window
s
-
op
e
n
-
eisdir-er
r
o
r' int
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Merge branc
h
'jk/color
s
-fix' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
un
i
o C Hamano
Merge
b
ran
c
h 'jk
/
c
h
e
cko
u
t-from-tree' i
n
to maint
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C
H
amano
G
it
2
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
Ham
a
no
Git 2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync
w
i
t
h v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
u
ni
o
C Hamano
Git
2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ham
a
no
Sync
w
ith v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
Git 1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hama
n
o
S
y
n
c with v
1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
i
t 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
mano
Merge b
r
anch 'do
t
git-ca
s
e-main
t
-1
.
8
.
5' into mai
n
t
-
1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
M
erge branch 'm
a
int' of git://git
h
ub
.
c
om/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Ham
a
no
Start post 2
.
2
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Juni
o
C Hamano
Git 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Ha
m
ano
Git 2
.
2
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Haman
o
Merge b
r
anch 'sv/submitting-final-p
a
tch'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Ham
a
no
Merge b
r
anch 'sn/tutorial-st
a
t
u
s-outp
u
t-example'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge b
r
anc
h
'mh/doc-remote-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C Hamano
M
e
r
g
e branch 'tb/
n
o-r
e
l
ati
v
e
-
f
ile-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch 'cc/interp
r
et-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Haman
o
Merge git://github
.
com/git-l10n/git
-
po
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merg
e
branch 'jc/doc-commit-only'
commit
|
commitdiff
|
tree
2014-11-18
Ju
n
io C Haman
o
Merge branch 'ta/tu
t
orial-moder
n
ize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Ham
a
n
o
Merg
e
b
ranch 'da/
d
ifftool'
commit
|
commitdiff
|
tree
2014-11-17
Junio C Hamano
Merge bran
c
h
'maste
r
' of
g
it://github
.
com/gi
t
-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-14
Jun
i
o
C
H
aman
o
Git 2
.
2
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Junio
C
Hamano
Update draft re
l
ease
notes
t
o 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Junio
C Hamano
S
ync with 'ma
i
nt'
commit
|
commitdiff
|
tree
2014-11-12
Jun
i
o C Ha
m
ano
Merge branch
'nd/g
i
tign
o
re-
t
railing-white
s
pa
c
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
Merge branch 'j
k
/
f
e
t
c
h-reflog
-
df-conflict'
commit
|
commitdiff
|
tree
2014-11-11
Junio C Hamano
Sync
with mai
n
t
commit
|
commitdiff
|
tree
2014-11-11
J
unio C Hamano
Mer
g
e
branch 'rs/clean-men
u
-it
e
m-de
f
n' into maint
commit
|
commitdiff
|
tree
2014-11-10
Jun
i
o C
H
amano
Merg
e
branch 'ma
s
t
er' of g
i
t://g
i
t
h
ub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-10
Junio C Ha
m
a
n
o
S
ync with ma
i
nt
commit
|
commitdiff
|
tree
2014-11-10
Junio C Hamano
Merge branch 'js/diff-highlig
h
t-
a
void-sigpipe'
commit
|
commitdiff
|
tree
2014-11-07
Junio
C Hamano
Git 2
.
2
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-07
Juni
o
C Hama
n
o
Documentation/git-c
o
mmit:
clarify that --only/--include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-06
Junio C Ha
m
a
no
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2014-11-06
Junio C
Hamano
Merge
branch 'nd/gitig
n
ore-tra
i
li
n
g-whitespac
e
'
commit
|
commitdiff
|
tree
2014-11-06
Junio C
H
ama
n
o
Merge branch
'
t
m/line-log-fi
r
s
t
-parent'
commit
|
commitdiff
|
tree
2014-11-06
J
unio C Ha
m
ano
Merge
br
a
nch '
j
k/fet
c
h-refl
o
g
-df-c
o
nfl
i
ct'
commit
|
commitdiff
|
tree
2014-11-06
J
unio C Hamano
Merge
branch
'
rs
/
u
se-child-process-
i
nit-m
o
re'
commit
|
commitdiff
|
tree
2014-11-06
Junio
C Hamano
Merge branch 'jk/ca
c
he-
t
ree-protec
t
-from
-
br
o
ken-lib
g
it2'
commit
|
commitdiff
|
tree
2014-10-31
Junio C
H
amano
Git
2
.
2
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
M
e
rge
b
ra
n
ch 'for-jun
i
o' of git://bogomip
s
.
org/g
i
t-s
v
n
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
Merg
e
branch 'jc/push-
c
ert'
commit
|
commitdiff
|
tree
2014-10-31
Jun
i
o C Hamano
Merge branch 'rs/child-proce
s
s-init'
commit
|
commitdiff
|
tree
2014-10-31
Jun
i
o
C Haman
o
Merge
b
ranch
'rs/
g
rep
-
color
-
words'
commit
|
commitdiff
|
tree
2014-10-30
Juni
o
C Hamano
bund
l
e:
split ou
t
a help
e
r
function to
compute a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-30
J
u
nio C Hamano
bun
d
l
e: split out a helper functio
n
t
o
create pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-30
Junio C Ham
a
no
Me
r
ge git://ozlabs
.
org/~paulus/gitk
commit
|
commitdiff
|
tree
2014-10-29
Junio C H
a
mano
Sync with
G
i
t
2
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hama
n
o
Git 2
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io C Hamano
Merge bran
c
h
'jk/pack-ob
j
ec
t
s-no-bitmap-whe
n
-spl
i
ttin
g
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C Ha
m
ano
Merg
e
branch 'da/mergetool-meld' into
m
aint
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o C Ham
a
no
Merge branch 'rm/gitweb-st
a
rt-form' into maint
commit
|
commitdiff
|
tree
2014-10-29
Junio C Ham
a
n
o
M
e
rge
b
ranch '
b
c
/asciidoc-pr
e
tty-formats-fix' into
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C Ham
a
no
Merge branch 'rs/daemon-fixes'
into maint
commit
|
commitdiff
|
tree
2014-10-29
Junio
C
H
am
a
no
U
p
da
t
e draft
r
eleas
e
n
ote
s
to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Junio
C Hamano
M
e
rge b
r
a
nch 'da/diff
t
ool'
commit
|
commitdiff
|
tree
2014-10-29
Junio C
H
a
m
ano
Merge bran
c
h 'rb/pack-windo
w
-me
m
o
ry-c
o
nfig-doc
'
commit
|
commitdiff
|
tree
2014-10-29
Junio
C
Hamano
M
erge
b
ranch 'mg
/
lib-gpg-ro-safety
'
commit
|
commitdiff
|
tree
next