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: introduce merge.ff configuration variable
2011-05-06
Junio C Hamano
merge: intro
d
uce m
e
r
ge
.
ff c
o
nfigurat
i
o
n varia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
b
r
a
nch
'jc/mai
n
t-bran
c
h
-
merg
e
options' into
m
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
merge: make branch
.
<nam
e
>
.
mer
g
e
options
correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
5-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C Hamano
Sync wi
t
h
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
u
nio C Ham
a
n
o
Revert "r
u
n-c
o
mmand: pre
t
ti
f
y -D_FORTIFY_SOURCE workar
o
und"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Hama
n
o
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-04-13
J
unio
C
H
a
man
o
Merge branch
'jc/r
e
v-li
s
t-optio
n
s-fix' int
o
maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge br
a
nch 'js/che
c
kout-untracked-s
y
mlink' into maint
commit
|
commitdiff
|
tree
2011-04-12
Junio
C
Hamano
Merge br
a
nch
'js/
c
hec
k
out-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
J
unio
C
Ham
a
n
o
Merge branch 'nd/
i
nit-
g
itdir'
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge git://git
.
bogomi
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge
g
it://git
.
kern
e
l
.
org/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
a
mano
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch 'nm/maint-co
n
fl
i
cted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
Me
r
g
e
bran
c
h
'mg/rev-list-n-reverse
-
do
c
' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hama
n
o
Merge branch 'jk/m
a
int-re
m
ote-mirro
r
-s
a
f
e
r'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Merge
b
ranch 'mg/
d
oc-revision
s
-txt'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Hamano
Merge
bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2011-04-04
Juni
o
C Ha
m
a
n
o
Mer
g
e
b
ranch 'jl/submodule-f
e
tch
-
on-demand'
commit
|
commitdiff
|
tree
2011-04-04
J
u
ni
o
C H
a
m
a
no
Merge
branch 'jc/rev-list-options-
f
ix'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ham
a
n
o
Merge
branch '
n
m/maint-con
f
licted-submodule
-
e
n
tries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
ma
n
o
Start preparing for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
Merge br
a
nch 'jc/index
-
update-if-able' into
m
aint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
H
aman
o
Merge
branch 'lt/default-
a
bbrev' into maint
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o
C
H
a
m
ano
Merge branch
'jc/maint
-
rev-
l
ist-culled-boundary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge
b
ranch 'mm/maint-log-n-with-di
f
f-filtering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch
'jk/format-
p
atch-
m
ultiline
-
header'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
r
g
e branch 'jn/mai
n
t-instaweb-plack-
f
ix' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio
C Ha
m
ano
Mer
g
e branch 'lp/config-vernam
e
-check' into mai
n
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Update r
e
lease no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Sync wi
t
h 1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hama
n
o
Git
1
.
7
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Hamano
Do
c
: mention
--delta-base-offset is the default for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-02
Juni
o
C Hamano
Merge
b
r
a
nch 'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Haman
o
Me
r
ge branch 'jc/m
e
rge-sans-branch'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
M
e
rg
e
b
r
anch
'jr/grep-e
n
-config'
commit
|
commitdiff
|
tree
2011-04-02
J
unio
C Hamano
M
e
rge branch 'ab/i18n-st'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o
C
H
amano
Merge branch 'jk/
p
u
l
l
-
into-
e
mp
t
y
'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Ham
a
no
Merg
e
b
r
anch '
s
b/sparse-mo
r
e'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
M
e
rge
branch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-01
Junio
C Hama
n
o
Merge b
r
anch '
n
d/index-doc'
i
nt
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-01
J
unio C Hamano
Merge branch 'pk/stash-apply-
s
tatus-relative' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
unio C Hama
n
o
Merge branch
'j
c
/
m
aint-diff
-
q-filter' into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C
H
ama
n
o
Mer
g
e branch 'js/maint-sta
s
h
-
index-cop
y
' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
unio C Ham
a
no
Merge
b
ranch 'mg/doc-bisect-tweak-worktree' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-01
Junio
C
Haman
o
Merge branch 'jh/maint-do-not-track-non-branches' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o
C Ham
a
n
o
Merge branch 'fk/maint
-
cvsimp
o
rt-early-failure' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio
C
H
aman
o
Merge b
r
anch 'jc/ma
i
nt-
a
pply-report-o
f
fset' into maint
commit
|
commitdiff
|
tree
2011-04-01
Ju
n
io C Hamano
Merge branch 'jc/maint-apply-no-double-patch' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio
C
Hamano
Merge
b
ranch 'js/check
o
ut-un
t
racked
-
sy
m
lin
k
' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Mer
g
e "checkout ambiguous ref bugfix
"
in
t
o maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
"
lo
g
--cherry-pick" documentation
r
egression fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio C Hama
n
o
Git 1
.
7
.
5-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio C Hamano
Merge bra
n
c
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2011-03-31
Jun
i
o C Hamano
pars
e
-
re
m
ot
e
:
typofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Junio
C
Hamano
Merge
branch
'
m
aint'
commit
|
commitdiff
|
tree
2011-03-30
J
unio C
H
a
m
a
no
t8001: check
t
he exit sta
t
us of the
command
being tested
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Junio C
H
a
mano
Mer
g
e branch 'svn-fe' of git://repo
.
or
.
cz/git/jrn
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hama
n
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
M
erg
e
b
r
a
nch 'jc/
f
et
c
h-p
r
o
g
ressive-stride'
commit
|
commitdiff
|
tree
2011-03-29
Junio
C
H
amano
Merge branches 'sp/ma
i
nt-fetch-pack-st
o
p-early' and
.
.
.
commit
|
commitdiff
|
tree
2011-03-29
Jun
i
o C Hamano
Rever
t
two "
n
o-
d
one" re
v
erts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
e
nable "no-
d
one" extension only
when
s
e
rving
o
v
er
s
mart
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
J
unio C
Ham
a
no
Fix
p
o
tenti
a
l
l
ocal deadlock
du
r
ing fetch-pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Ju
n
io C Hamano
enab
l
e "no-do
n
e" e
x
tens
i
on only when fetc
h
i
ng over
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio
C Haman
o
Re
v
ert
"
fetch-pack:
I
mplem
e
nt no-done cap
a
bili
t
y"
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
Rever
t
"u
p
load-p
a
ck: I
m
plement no-done capability"
commit
|
commitdiff
|
tree
2011-03-28
J
unio C
Hamano
Merge
b
r
anch '
m
a
i
nt
'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Hamano
Update draft rele
a
se note to 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-27
Juni
o
C Ham
a
no
Merge branch 'mg/rev-list-n-p
a
re
n
t
s
'
commit
|
commitdiff
|
tree
2011-03-27
Junio C
Hamano
Merge
branch 'js/remove-unused-variables'
commit
|
commitdiff
|
tree
2011-03-27
J
unio C Ham
a
no
Mer
g
e branch 'jp/compl
e
tion-he
l
p-
a
lias
'
commit
|
commitdiff
|
tree
2011-03-27
Ju
n
io
C
H
am
a
n
o
Merge branc
h
'jc/index-update-if-able'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Hama
n
o
Mer
g
e bra
n
ch 'jk
/
checkout-orphan-
w
arning'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Ham
a
no
Merge branch
'
j
c/m
a
i
nt-rerere-i
n
-workdir'
commit
|
commitdiff
|
tree
2011-03-27
Ju
n
i
o
C
Hamano
Merge branch 'nd/index-do
c
'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Ha
m
ano
Merge bra
n
ch '
j
c/fetch-
p
rogressive-s
t
r
id
e
'
commit
|
commitdiff
|
tree
2011-03-26
Junio C Hamano
Me
r
ge branch 'svn-
f
e' of
g
it:/
/
rep
o
.
or
.
cz/git
/
jr
n
commit
|
commitdiff
|
tree
2011-03-26
J
unio C
H
a
ma
n
o
Merg
e
git-
g
u
i
0
.
14
.
0
commit
|
commitdiff
|
tree
2011-03-26
Junio C H
a
mano
Sync
wit
h
1
.
7
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-26
Junio C Ha
m
ano
Git 1
.
7
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-24
Junio C Haman
o
m
e
rge:
m
e
rge with th
e
def
a
ult
upst
r
e
a
m branch wi
t
hout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-23
J
un
i
o C Ham
a
no
rere
r
e:
make sur
e
it w
o
r
k
s
e
ven in a workdir attached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-23
J
unio C
Hamano
d
o
c: technical details about the in
d
e
x
fil
e
f
ormat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-23
Junio
C
Hama
n
o
Merge br
a
nch
'
k
c/gitweb-pat
h
info-w-anchor'
commit
|
commitdiff
|
tree
2011-03-23
Junio
C Ha
m
a
no
Merge branch 'j
n
/forti
f
y-source-work
a
round'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hama
n
o
Merge branch 'jn/
m
aint-c99-format'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hamano
Merge branch 'lt/
d
efault-abbrev
'
commit
|
commitdiff
|
tree
2011-03-23
Junio C H
a
mano
Merge branch 'pk/stas
h
-apply-status-relative'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Ha
m
ano
Merge bra
n
ch 'jc/maint-diff
-
q-filte
r
'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Ham
a
n
o
Merge b
r
a
n
c
h 'pw/p4'
commit
|
commitdiff
|
tree
2011-03-23
Junio
C
Hamano
Update draft
release notes to
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next