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 'ss/cherry-pick-x-doc' into maint
2011-05-16
Junio
C
H
amano
Merge
b
r
a
n
c
h 'ss
/
cher
r
y-
p
i
c
k-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ham
a
no
Merge b
r
anch 'vr/m
e
rge-base-do
c
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branc
h
'
s
r
/maint-fast-import-tigh
t
en-option-
p
arsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o
C Ha
m
ano
Merge br
a
nch
'
j
c/t1506-she
l
l-param-expansio
n
-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'j
c
/fix-add-u-un
m
erged' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Hamano
M
e
rge br
a
n
ch 'jn/gitweb-
d
ependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge bran
c
h 'jc
/
m
a
int-branch-mer
g
eop
t
io
n
s'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
H
amano
Mer
g
e
b
ranch 'jc/main
t
-add-p-overlapping-hun
k
s
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C H
a
mano
U
p
date draft release notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'cn/format
-
patch-
q
uiet
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Ham
a
no
Me
r
ge
b
ra
n
ch 'jm/mergetool-submodules' i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Ha
m
ano
Merg
e
bra
n
c
h
'jk/f
o
rmat
-
patch-quote-speci
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
bra
n
ch 'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Ham
a
no
git_open_noat
i
m
e(): dro
p
u
n
used p
a
rameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_f
i
le:
typ
o
fi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Merge branch 'aw/
m
a
int-reb
a
se-i-p-no-ff' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge b
r
anch '
j
s/bl
a
me-parsen
a
me' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge
b
ranch 'gr/cv
s
i
mpor
t
-altern
a
tive-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hamano
M
erg
e
branch 'cj/p4mer
g
e' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Haman
o
Merg
e
b
r
a
nch
'
jk/merge-
o
ne-file-workin
g
-t
r
e
e
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge branch 'jc/f
i
x-diff-files-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Me
r
ge branch 'mz/ma
i
nt-re
n
ame-unmer
g
ed' into
m
aint
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
a
mano
t1507: avo
i
d
"
${
p
a
r
a
me
t
er<op>'word'}
"
i
nsi
d
e
doubl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io
C H
a
mano
t3701:
add-p
-
fix mak
e
s the last tes
t
to
p
ass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
merge: make b
r
anch
.
<name>
.
mergeo
p
tions correctly
o
ve
r
ride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C H
a
m
ano
t3701: fix here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
a
m
ano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge b
r
a
nch 'jh/dirstat
'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'sp/ma
i
nt-cl
e
ar-pos
t
field
s
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
ano
Merge br
a
nch '
j
k/maint-stash-oob' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge
b
ran
c
h 'jk/m
a
i
n
t
-
u
p
l
oad-pa
c
k-shallow' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge b
r
anch
'dm/stash-k-i-p' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'j
c
/
pack
-
objects-bigf
i
le' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch 'mg/reflog-with-optio
n
s' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ha
m
ano
Merge branch 'jk
/
s
t
a
sh
-
l
o
osen-sa
f
ety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Me
r
ge b
r
anch 'ar/cl
e
an-rm
d
ir-empt
y
'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge br
a
n
c
h 'mg/sha1-path-adv
i
s
e' into maint
commit
|
commitdiff
|
tree
2011-04-29
J
un
i
o C Hama
n
o
"add -
p
": wor
k
-around an old lazi
n
e
s
s t
h
at does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
add--interactive
.
perl: factor out
r
epeated --recou
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
t3701: E
d
it
i
ng a split hunk i
n
a
n
"
add
-p" sessio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
ma
n
o
a
d
d -p: 'q' should really qui
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
a
mano
S
t
a
rt 1
.
7
.
5
.
1
mainten
a
n
ce track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
M
e
r
g
e branch 'mg/x-years-12-months' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-04-26
J
unio C
Hamano
http:
clear PO
S
TFIELDS w
h
en initi
a
lizing
a
s
l
ot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hama
n
o
G
it 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
Fix "a
d
d -u"
th
a
t s
o
metimes
f
a
ils to res
o
lve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
diff-files: show unmerged entr
i
e
s
co
r
rec
t
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C H
a
mano
diff:
r
emove often un
u
sed parameters from
diff
_
un
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
diff
.
c: re
t
u
rn filepair from di
f
f_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
test: use $_z
4
0
from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ha
m
a
no
Git 1
.
7
.
5-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio
C
Ha
m
an
o
Git
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Ju
n
io C Ham
a
no
Rev
e
r
t "run-comman
d
: prettify -D_FO
R
TIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
Hamano
Merge
b
r
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
G
it
1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
H
amano
Merge
b
ranch '
j
c/rev-li
s
t-optio
n
s
-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Merge branch
'js/ch
e
c
kout-untr
a
c
ked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branch 'js/checkout-untrack
e
d-sy
m
link'
commit
|
commitdiff
|
tree
2011-04-12
Junio
C
H
aman
o
Merge branch 'nd/
i
nit-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Ha
m
a
n
o
Mer
g
e git://
g
it
.
bogomips
.
org/g
i
t-
s
vn
commit
|
commitdiff
|
tree
2011-04-11
Ju
n
io C Hamano
Merge git://git
.
kern
e
l
.
org/p
u
b/scm/
g
i
t
k/gitk
commit
|
commitdiff
|
tree
2011-04-06
J
u
ni
o
C Hama
n
o
Git 1
.
7
.
5-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Ha
m
ano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
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/m
a
int-conflicted-submod
u
le-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Mer
g
e
bran
c
h
'
mg
/
rev
-
li
s
t-n-
r
e
v
ers
e
-doc
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C
H
a
m
an
o
Merg
e
branch 'jk/ma
i
n
t
-remote-mirror-
s
afer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge
branc
h
'mg/doc-rev
i
sions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Ha
m
an
o
Teach core
.
bigfil
e
thr
e
a
s
h
old
to pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
un
i
o C
H
amano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Hamano
M
e
r
g
e br
a
nc
h
'jl/sub
m
odule-fetch-
o
n-demand
'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Ha
m
ano
M
e
rge branch 'jc/rev-list
-
options-fix'
commit
|
commitdiff
|
tree
2011-04-04
Juni
o
C H
a
mano
Merge branch 'nm/maint-co
n
flicted-submodule-entries'
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C
H
a
mano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Start preparing
f
or 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
am
a
no
Merge branc
h
'
jc/index-update-if-able' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
mano
Merge
branch 'lt/default-ab
b
rev
'
i
nto
maint
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
i
o
C Hamano
Mer
g
e
branch 'jc/maint-
r
ev-list-c
u
lled-boundary'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Ha
m
ano
Merge bran
c
h
'mm/maint-log-n-with-d
i
ff-filtering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'jk/format
-
patch-multil
i
ne-header' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o
C Hamano
Merge b
r
anch 'jn/maint-instaweb-plack-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io
C
H
amano
Merge branch
'
lp/c
o
n
fig-ve
r
name-che
c
k
' into
m
aint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Update release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Sy
n
c with 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: mention --delta-
b
ase-offset
is the defaul
t
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-02
Juni
o
C
Hamano
M
er
g
e br
a
n
ch '
n
d/init
-
gitdir'
commit
|
commitdiff
|
tree
2011-04-02
J
unio C Ham
a
no
Merge
branch
'
jc/merge-sans-bran
c
h'
commit
|
commitdiff
|
tree
2011-04-02
Junio C
H
amano
Merge branch
'jr
/
grep-en-config'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C Hamano
Merge branch 'ab/i18n-st'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge
branch 'jk/pull-into-empty'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge branch 'sb/s
p
arse-more'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-01
Junio C H
a
m
a
n
o
M
erg
e
branch
'
nd/index
-
doc' into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio
C Hamano
Merge branch 'pk/stash-
a
pply
-
status-rela
t
iv
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merg
e
branch 'jc/main
t
-diff-q-filter
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-04-01
Ju
n
i
o
C Hamano
Merge branch 'js/mai
n
t
-
stash-
i
ndex-copy' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
next