repo.or.cz
/
git
/
jrn.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/merge-one-file-working-tree' into maint
2011-05-13
Junio
C
Hamano
Merge branch 'jk/merge-
o
ne-file-working-tree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-
d
i
f
f-files-
u
n
merged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
branch 'mz/
m
aint-rename-unmerged' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Hamano
t3701: fix he
r
e do
c
ument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hama
n
o
Merge bra
n
ch
'jh/di
r
s
tat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'sp/maint-
c
lear-p
o
s
t
f
i
elds' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
er
g
e branch '
j
k/maint-stash
-
oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch '
j
k
/maint-upload-pack-shallow' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge b
r
anch 'dm/stash-k-
i
-p' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
J
uni
o
C
H
amano
Merge branch 'j
c
/pack-objects-big
f
ile' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Merge br
a
n
c
h 'mg/reflog-with-options' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
ch
'j
k
/stash-
l
oosen-safety' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C H
a
mano
Merge br
a
nch 'ar/cl
e
an-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge br
a
n
ch 'mg/
s
h
a
1-path-ad
v
ise' into m
a
int
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
S
t
art 1
.
7
.
5
.
1 maintena
n
ce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
Merge branch 'mg/x-
y
ears
-
12-months
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-04-26
Junio C
Ha
m
ano
htt
p
:
clear POSTFIELDS when ini
t
i
aliz
i
ng a
s
l
ot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
i
o
C Hamano
diff-
f
iles:
s
ho
w
un
m
e
r
ged
e
ntr
i
es correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
i
o C Ha
m
a
n
o
diff: remove ofte
n
unus
e
d
p
aramet
e
rs
fr
o
m dif
f
_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
if
f
.
c: ret
u
r
n filepair
f
r
om d
i
ff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
t
e
st: use $_z40 from test-li
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
5-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
mano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio
C Hamano
Revert
"
run-command: prett
i
fy -D_F
O
RT
I
FY_S
O
URCE
wor
k
around"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
a
mano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
no
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Hamano
M
er
g
e b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-13
J
u
ni
o
C Hama
n
o
Me
r
g
e branch 'jc/re
v
-li
s
t-opt
i
ons-fi
x
' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hamano
Merge branch '
j
s
/checkout-untracked-
s
ymlink' into
m
aint
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge b
r
anch 'js/c
h
ec
k
out-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
J
u
n
i
o C
H
amano
M
e
rge
b
ranch 'nd
/
init-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Hamano
Me
r
ge
g
it://git
.
bogomi
p
s
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
H
a
mano
Merge git
:
//git
.
k
ernel
.
o
rg/pub/
s
cm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git
1
.
7
.
5-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Sync with
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Ha
m
ano
Gi
t
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hama
n
o
Merge branch
'
nm/m
a
int-con
f
licted-submo
d
ule-entr
i
es
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Ha
m
ano
Merge branch '
m
g/rev-list-n-reverse-doc'
into
maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
M
erge branch 'jk/ma
i
nt-remote-mi
r
ro
r
-safer'
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io
C
Hamano
Merge bra
n
ch
'
mg/
d
oc-revisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
mano
Teach core
.
bigfilethrea
s
hold to pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Hamano
Me
r
g
e
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io
C Hamano
M
erg
e
branch 'jl/s
u
bmodule-fetch-on-
d
emand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge
b
r
anch 'jc/rev-l
i
st-options-fix'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ha
m
a
no
Merge branch 'nm/maint-c
o
nflicted-submodule
-
e
n
tries'
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Ham
a
no
Merge br
a
nch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Star
t
prepar
i
ng fo
r
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
J
u
n
io C Hamano
Merge branch 'jc/
i
ndex-up
d
at
e
-i
f
-
able' into maint
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Hamano
Merg
e
branch 'lt/
d
efault-abbrev
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
r
g
e branch 'jc/maint-
r
ev-lis
t
-
c
u
lled-bo
u
ndary' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
i
o
C Hamano
Merge branch 'm
m
/
maint-log-n-with-diff-filtering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Ham
a
no
Merge branch 'jk/format-
p
atch-multiline-header' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
amano
Merge branch 'jn
/
maint-instaweb
-
plack-fix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge bra
n
ch 'lp/confi
g
-vername-check'
into m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Hamano
Update re
l
ease note
s
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
Junio C Hamano
Git 1
.
7
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Doc:
m
enti
o
n
-
-
d
elta-base-offset
i
s
the
d
e
fault f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-02
Juni
o
C Haman
o
M
er
g
e br
a
nch 'nd/init-gitdi
r
'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C Hamano
Merge
b
r
a
nc
h
'
j
c/merge-s
a
ns-branc
h
'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C Hamano
Mer
g
e
branch 'jr/grep-en-config'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C
H
a
mano
Mer
g
e branch 'ab/
i
18n-st'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Mer
g
e branch 'jk/pull-
i
nto-empty'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge
b
r
a
n
c
h 'sb/spar
s
e-mor
e
'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C Hamano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-01
Junio C
Hama
n
o
M
e
rge branch 'nd/
i
ndex-doc' into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C
Ha
m
ano
M
e
rge branc
h
'p
k
/stash-a
p
p
l
y
-
st
a
t
us
-
rela
t
ive' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merg
e
branch
'jc/maint-diff-q-filt
e
r
'
int
o
maint
commit
|
commitdiff
|
tree
2011-04-01
Ju
n
io C Hamano
Merge branch 'js/maint-stash-
i
ndex-copy' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
M
e
rge branch 'mg/doc
-
bisect-twea
k
-worktree'
int
o
m
aint
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C Ham
a
no
Me
r
ge bra
n
ch 'jh/mai
n
t-do-no
t
-track-non-branc
h
es' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Ham
a
no
Merge bra
n
c
h
'
f
k/maint-cvsi
m
po
r
t-early-fail
u
re' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Juni
o
C Hamano
M
erge bra
n
ch '
j
c/maint-apply-report-offset'
into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
M
erge
b
ranch 'jc/maint-apply-no
-
double-patch' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o C Hama
n
o
Merge
bra
n
c
h
'js/
c
heckout-untracked
-
symlink' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-04-01
Junio C Ham
a
no
Merg
e
"chec
k
out ambiguous r
e
f bu
g
fix" into
m
aint
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o C
Hama
n
o
"lo
g
-
-
ch
e
rry-pic
k
"
docume
n
ta
t
ion re
g
ression fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio
C
Hamano
Git 1
.
7
.
5-r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio C
H
am
a
no
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-03-31
Junio C
Hamano
parse
-
remote: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
J
u
nio
C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-03-30
J
un
i
o C
Hamano
t800
1
: check
t
he exi
t
status of the com
m
a
nd being test
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Junio C Hamano
Merg
e
branch '
s
vn-
f
e' of
git://rep
o
.
or
.
cz
/
git/jrn
commit
|
commitdiff
|
tree
2011-03-29
J
un
i
o C
H
amano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
Merge branch '
j
c/fetch-progressive-stride
'
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hamano
Me
r
ge branches
'sp
/
mai
n
t-fe
t
ch-pack-s
t
o
p-ea
r
ly' and
.
.
.
commit
|
commitdiff
|
tree
2011-03-29
Junio
C H
a
mano
Revert two
"no-do
n
e"
r
e
verts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hama
n
o
en
a
ble "
n
o
-done" extension only when serv
i
ng over sm
a
rt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C
Hamano
Fi
x
potential local deadlock
during fetch-pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
J
unio C Hamano
enable "no
-
d
o
ne" extension only when fet
c
h
ing over
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Jun
i
o C Hamano
Rever
t
"fetch-pack:
I
m
p
lement no-done capability
"
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hama
n
o
Rever
t
"up
l
oad
-
pack: Impl
e
ment no-
d
on
e
capability"
commit
|
commitdiff
|
tree
2011-03-28
Junio
C
H
a
ma
n
o
Merg
e
branch
'
maint
'
commit
|
commitdiff
|
tree
2011-03-27
J
u
n
io C Ham
a
no
U
pdate dr
a
f
t
r
eleas
e
note to 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-27
Junio C Ha
m
a
no
Merge b
r
anch
'mg/re
v
-
list-n-parents'
commit
|
commitdiff
|
tree
2011-03-27
J
u
nio C Hama
n
o
M
erge bran
c
h 'js/remo
v
e-unused-variables'
commit
|
commitdiff
|
tree
2011-03-27
Juni
o
C Ha
m
ano
Merge
b
ranch
'jp/
c
omple
t
ion-help-alia
s
'
commit
|
commitdiff
|
tree
next