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
J
u
nio C
H
amano
me
r
g
e
: introd
u
c
e
m
erge
.
ff configu
r
ati
o
n var
i
a
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
M
e
rg
e
branch 'jc/maint
-
b
ranch-mergeoptions' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Ham
a
n
o
merge: make bra
n
ch
.
<name
>
.
mergeoptions c
o
rrectly over
r
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
G
it 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
Ha
m
ano
Git 1
.
7
.
5
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C Hamano
Syn
c
w
i
th 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Ham
a
no
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Juni
o
C Hamano
Reve
r
t
"ru
n
-com
m
a
n
d: prettify -D_FORTIFY_SOURCE workar
o
u
n
d"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
am
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Git
1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
i
o
C Hamano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2011-04-13
Junio C H
a
mano
M
e
rge
b
ranch 'jc
/
rev-list-op
t
ions
-
fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
e
r
ge bran
c
h
'
js/checkout-untrack
e
d-symlink' into main
t
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branch
'
js/checkout-untracked-symli
n
k'
commit
|
commitdiff
|
tree
2011-04-12
J
u
nio C Hamano
Merge branch 'nd/ini
t
-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
Ju
n
io C Hamano
Merge git://git
.
bogomips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2011-04-11
Ju
n
i
o
C Hamano
Merge git:
/
/git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
m
ano
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sync w
i
th
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C H
a
mano
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/mai
n
t
-
c
o
nfl
i
cted
-
submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Merge
b
ranch 'mg/rev-
l
ist-n-reverse-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
m
a
no
Merge br
a
nch 'jk/maint-remot
e
-mirro
r
-safer'
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C
Hamano
Mer
g
e branch 'mg/doc-revisions-txt'
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
io C Hamano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-04
J
unio
C
Ha
m
ano
Merge branch
'
j
l
/submodule-fetch-on-dem
a
nd'
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
i
o
C
Hamano
Merge branch 'jc
/
r
e
v-list-options-fix'
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
i
o C Hamano
Merge b
r
anch 'nm/maint-conflicted-submodule-entrie
s
'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
H
a
m
a
no
Start p
r
epari
n
g
for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
J
u
n
i
o
C
Ha
m
ano
Merge bra
n
ch 'jc/index-up
d
ate-i
f
-able
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge br
a
nch 'lt/default-
a
bbrev' into maint
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio
C
Hamano
Me
r
ge branch 'j
c
/main
t
-rev-list-culled-bo
u
ndar
y
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Ha
m
a
n
o
Merge branch 'mm
/
maint
-
lo
g
-n
-
with-dif
f
-
f
iltering' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merg
e
branch 'jk/forma
t
-patch-
m
ultiline-head
e
r' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Me
r
g
e branc
h
'jn/maint-instaweb-
p
l
a
c
k
-
f
ix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
rge b
r
anch 'lp/config-
v
ername-check' into maint
commit
|
commitdiff
|
tree
2011-04-03
J
u
n
io C Hamano
U
p
date release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Sync
w
ith 1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
G
it 1
.
7
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Hamano
Doc:
men
t
ion --delt
a
-base-offset
is the default
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C Ha
m
an
o
Merge branch
'n
d
/i
n
it-g
i
tdir'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C
H
ama
n
o
Merg
e
branch 'jc/mer
g
e-s
a
ns-branc
h
'
commit
|
commitdiff
|
tree
2011-04-02
J
uni
o
C
H
a
ma
n
o
M
erg
e
branch 'j
r
/grep-e
n
-config'
commit
|
commitdiff
|
tree
2011-04-02
Junio C
H
a
m
ano
M
e
rge branch 'ab/i18n
-
st
'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge branc
h
'jk/pull-into-empty'
commit
|
commitdiff
|
tree
2011-04-02
J
u
n
io C Hamano
Merge
branch 'sb/s
p
arse-m
o
r
e
'
commit
|
commitdiff
|
tree
2011-04-02
Juni
o
C H
a
mano
Merge
b
ran
c
h
'maint'
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge branch 'nd/inde
x
-do
c
' i
n
to maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge
b
ranch 'pk
/
stash-apply-s
t
atus-r
e
lati
v
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
un
i
o C Haman
o
Merge branch 'jc/maint-diff-q-filter
'
i
nto main
t
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge branch 'js/ma
i
nt-stash-index-copy' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
u
n
io
C
Hamano
Merge bra
n
ch 'mg/doc
-
b
isect-t
w
e
ak-worktree' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
un
i
o
C
Hama
n
o
Merge
bran
c
h 'jh/mai
n
t-do-not-trac
k
-n
o
n-branches'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C Ham
a
no
M
erge branch 'f
k
/maint-cvsimport-earl
y
-failu
r
e'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C Hamano
Merge bran
c
h 'jc/ma
i
n
t-apply-repor
t
-
o
ffs
e
t' i
n
to main
t
commit
|
commitdiff
|
tree
2011-04-01
J
unio C Hamano
Merge br
a
nch 'jc/maint-apply-no-double-
p
atch' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C Hamano
Merg
e
branch 'js/chec
k
out-unt
r
acked
-
symlink' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C H
a
mano
Merge "checkout ambiguous ref bugfix" into maint
commit
|
commitdiff
|
tree
2011-04-01
J
u
ni
o
C Hamano
"
l
og -
-
cherry-pick" do
c
umen
t
at
i
on regre
s
sion fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
J
unio
C
Hama
n
o
Git 1
.
7
.
5-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Jun
i
o C Hamano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-03-31
Junio
C Hamano
par
s
e-
r
emot
e
: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Junio C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2011-03-30
Junio C Hamano
t8001:
c
he
c
k the exit status of
the command being
teste
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Juni
o
C Ha
m
a
n
o
Merge b
r
anch '
s
v
n
-fe' of git://re
p
o
.
or
.
cz/git/jrn
commit
|
commitdiff
|
tree
2011-03-29
Juni
o
C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
Merge branch
'
jc
/
fetch
-
progressive-stride'
commit
|
commitdiff
|
tree
2011-03-29
J
unio C
Hama
n
o
Merge branch
e
s 'sp/maint-fetch-pack-sto
p
-ear
l
y' and
.
.
.
commit
|
commitdiff
|
tree
2011-03-29
J
unio
C Hamano
R
evert two
"no-done"
reverts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
enable "no-do
n
e"
e
xtension
only when
s
erving over
smart
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Ju
n
io C Hamano
Fix po
t
en
t
i
a
l local deadl
o
ck du
r
ing f
e
tch-
p
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
enable "no-done" extension onl
y
w
hen f
e
tchi
n
g
over
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C Ham
a
n
o
Revert "fetch-pack: Implement no-done ca
p
a
b
il
i
t
y
"
commit
|
commitdiff
|
tree
2011-03-29
Junio C
H
amano
Revert "
u
pload-p
a
ck: Imple
m
ent no-don
e
capability"
commit
|
commitdiff
|
tree
2011-03-28
Ju
n
i
o C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Ham
a
n
o
Update draft re
l
ea
s
e note to 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-27
Junio C Hamano
Merge br
a
nch 'mg
/
rev-list-
n
-pa
r
ents'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Hama
n
o
Merge b
r
anch 'js/re
m
ove-unused-variables'
commit
|
commitdiff
|
tree
2011-03-27
Ju
n
io C Ham
a
no
Merge br
a
nch 'jp/com
p
letion-
h
elp-alias'
commit
|
commitdiff
|
tree
2011-03-27
J
u
n
i
o C Ham
a
no
Merge branch 'jc/i
n
dex-updat
e
-
if-able'
commit
|
commitdiff
|
tree
2011-03-27
Junio
C
Ha
m
ano
Merge branch
'jk/checkout-orphan-w
a
rning'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Hamano
M
erge br
a
nch 'jc/maint-
r
erere-in
-
workd
i
r
'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Hamano
Merge branch
'nd/i
n
d
ex-doc'
commit
|
commitdiff
|
tree
2011-03-27
Ju
n
io C Ha
m
ano
Merge branch 'jc
/
f
e
tch-
p
r
ogressive-stride'
commit
|
commitdiff
|
tree
2011-03-26
Junio C Ha
m
ano
Merge
b
r
anch 'svn-fe' of g
i
t://r
e
p
o
.
or
.
cz/git/jrn
commit
|
commitdiff
|
tree
2011-03-26
Jun
i
o C
H
a
m
a
n
o
Mer
g
e git-gui 0
.
14
.
0
commit
|
commitdiff
|
tree
2011-03-26
Junio C
H
a
mano
Sync with 1
.
7
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-26
Junio
C
H
a
mano
Git
1
.
7
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-24
Junio C Hamano
mer
g
e
:
merge
with t
h
e default upstream branch without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hama
n
o
re
r
e
r
e: make sure it works e
v
en in a workdir attached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-23
J
unio C Hamano
doc:
t
echnical
det
a
ils about the index
fil
e
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-23
Junio
C
H
a
m
a
n
o
M
erge
b
r
anch 'kc/gitweb-
p
at
h
i
nfo-w-a
n
chor'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Ham
a
no
Merg
e
br
a
nch
'
jn/fortify-sou
r
ce-workaround'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Ham
a
no
Merge
b
ranch 'jn/maint
-
c9
9
-format
'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hamano
Merge branch 'l
t
/defau
l
t-
a
bbrev'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hamano
Merge branch 'pk/stash-apply-status-rela
t
i
ve'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hamano
Merge br
a
nch 'jc/maint-di
f
f-q
-
filter'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hamano
M
e
r
g
e bran
c
h
'
pw/p4'
commit
|
commitdiff
|
tree
2011-03-23
Junio C Hamano
Update dra
f
t
release notes to 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next