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 'jc/t1506-shell-param-expansion-gotcha' into maint
2011-05-16
J
u
ni
o
C Hamano
Merge
branch 'jc/t150
6
-shell
-
param-expa
n
sion-
g
otcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branc
h
'jc/fix-add-u-
u
nme
r
ged
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
a
m
an
o
Merge
branch 'jn/gitw
e
b-de
p
endency'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Ham
a
no
Mer
g
e br
a
nch
'
jc/ma
i
nt-branch-m
e
rgeoptions' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
erg
e
branc
h
'jc/maint-add-
p
-overlapping
-
hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Upd
a
te
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 bran
c
h 'cn/format-
p
atch-
q
uiet' into main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge branch 'jm/mergetool-submodu
l
es' into m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ha
m
ano
Merge branch 'jk/format-patch-quote-speci
a
l
-
in-fro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch
'
v
h
/git-svn-doc' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-15
J
u
ni
o
C
Ham
a
no
git_open_
n
o
ati
m
e
(
)
:
drop un
u
s
e
d para
m
eter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_fi
l
e: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Pr
e
pa
r
e
for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
un
i
o
C
H
amano
M
e
rge branch 'aw
/
maint-r
e
base-i-p-n
o
-ff'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'js/blame-
p
arsename' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'gr/cvs
i
mpo
r
t-alternative-
c
v
s
pass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'cj/p4merge' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
a
n
o
Merge
b
ran
c
h 'jk
/
m
e
rg
e
-
o
ne-file-working-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
am
a
n
o
Mer
g
e bra
n
ch '
j
c/fix-
d
iff-
f
i
l
es-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C H
a
mano
M
er
g
e b
r
anch 'mz/maint-rename-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
aman
o
t
1507:
a
void
"
${parameter<
o
p>'word'}"
inside double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
ma
n
o
t3701: a
d
d-p-fix makes t
h
e last t
e
st to pa
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
i
o
C Hamano
mer
g
e: make
b
ranch
.
<name>
.
mergeopt
i
ons
c
orrectly o
v
err
i
de
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o
C Hamano
t
3
701
:
f
i
x here d
o
c
u
men
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hama
n
o
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erg
e
b
ranch 'jh/d
i
rstat'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
Merge branch 'sp/
m
aint-clear-postfie
l
d
s
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-stash-oob
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge branch '
j
k/ma
i
nt-upload-pack-
s
hallo
w
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ham
a
no
Merge b
r
anc
h
'dm/stash-k-i-p' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Mer
g
e branch 'jc/pack-objects-bigfile' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Merge branch 'mg
/
re
f
log-w
i
th
-
opti
o
ns' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Mer
g
e bra
n
ch 'j
k
/
stash-loosen-s
a
fety' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Merg
e
br
a
nch '
a
r/clean-
r
m
d
ir-em
p
ty'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merg
e
branc
h
'mg
/
sha1-path-
a
dvis
e
' into maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"ad
d
-p": work-ar
o
und an old laziness that does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
a
n
o
add--in
t
eractive
.
perl: factor out
repeated --
r
ecou
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o C Ha
m
ano
t3
7
01: Editing
a split hunk in an "
a
dd -p"
sessi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
a
d
d -p:
'
q' should really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start
1
.
7
.
5
.
1 mainten
a
nce
tr
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Haman
o
M
e
rg
e
b
r
an
c
h '
m
g/
x
-
y
ears-12
-
mon
t
hs
'
into m
a
int
commit
|
commitdiff
|
tree
2011-04-26
Juni
o
C Haman
o
h
ttp: clear POS
T
FIELDS when in
i
tializing a s
l
o
t
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
Junio
C
Ham
a
no
Fix
"
add -u" that
s
ometim
e
s fails to res
o
lve unme
r
ged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
amano
dif
f
-file
s
: sho
w
unmerged entr
i
es c
o
rrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
d
iff: remove often unu
s
e
d
p
arameters from
d
iff_un
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c:
r
e
turn filepair from diff_u
n
m
erg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
te
s
t: use
$_z40 from t
e
st-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
a
m
ano
Sync with
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 Hamano
Revert
"run-comm
a
nd: prettify -
D
_
F
ORTIF
Y
_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Ham
a
no
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C Hamano
Git
1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-04-13
J
unio
C
Hamano
Merge b
r
anch 'jc/rev-list-
o
pt
i
ons-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
i
o C
H
a
mano
Mer
g
e branch 'js/checkout-untrack
e
d
-
symlink
'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-04-12
J
u
nio C Hama
n
o
Merge
bran
c
h 'js/checkout
-
u
ntracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge
branch 'n
d
/init-
g
itdir'
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Me
r
ge g
i
t://git
.
bogomips
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
M
erge git:/
/
git
.
kerne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
G
i
t 1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C H
a
m
ano
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
M
e
rge branch
'
nm/maint-
c
onflicted-
s
ubmodule-ent
r
ie
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch 'mg/rev-
l
ist-n-
r
e
v
erse-doc
'
into maint
commit
|
commitdiff
|
tree
2011-04-06
J
unio
C
Hamano
Merge
b
r
a
nch
'
jk/maint-remote-mirror-sa
f
e
r'
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
M
e
rge
branch 'mg/
d
o
c-revi
s
ions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teac
h
co
r
e
.
b
i
gf
i
lethreashold to
pack-object
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ha
m
ano
Merge branch 'jl/submodule
-
fetch-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Juni
o
C Ha
m
ano
Merge bra
n
c
h 'jc/rev-list-op
t
i
o
ns-fix'
commit
|
commitdiff
|
tree
2011-04-04
Junio C H
a
mano
Merge branch 'nm/ma
i
n
t-conf
l
i
cted-submodu
l
e-entries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Start preparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
uni
o
C Hamano
Merge branch 'jc/index-update-if-ab
l
e' into maint
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o
C
H
a
mano
Merge branch 'lt/default-abb
r
ev' into mai
n
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
ano
M
erge br
a
nch 'jc/main
t
-rev-lis
t
-cul
l
ed-boundary
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch
'mm/maint-log-n-with-
d
iff-filterin
g
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branc
h
'jk/format-patch-multiline-heade
r
' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
i
o
C Hamano
Mer
g
e
bran
c
h 'jn/maint-instawe
b
-plack-fix' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
Merge bran
c
h 'lp/co
n
fig-vername-check' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hama
n
o
Updat
e
relea
s
e note
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
unio
C
Hamano
Sync 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:
m
ention -
-
delta-bas
e
-o
f
fset is the
d
efau
l
t for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-02
J
unio C
H
ama
n
o
Merge
b
ranch 'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Ham
a
no
Merge branch '
j
c/merge-sa
n
s-branch'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge b
r
a
n
ch 'jr/gr
e
p-en
-
c
onfig'
commit
|
commitdiff
|
tree
2011-04-02
J
unio C Hama
n
o
Merge br
a
nch 'ab/i18n-st'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge
b
r
a
nch 'jk/pull-i
n
to-empty'
commit
|
commitdiff
|
tree
2011-04-02
Junio
C
H
amano
Me
r
ge
branch 'sb/sparse-mor
e
'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C Hamano
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge branch 'nd/index-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
un
i
o
C Hama
n
o
Merge branch 'pk/stash
-
apply-status-
r
e
lative
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Haman
o
Merge bra
n
ch 'jc/maint-diff
-
q-fil
t
er' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Mer
g
e b
r
anc
h
'js/ma
i
n
t
-st
a
sh-index-copy' int
o
maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Mer
g
e b
r
anch '
m
g
/d
o
c-bis
e
c
t-tweak-worktree' into
m
aint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
M
e
rge br
a
nc
h
'jh/
m
aint-do-not-track-n
o
n-br
a
nche
s
' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C
Ha
m
an
o
Mer
g
e br
a
nch 'fk/ma
i
nt-cvsi
m
port
-
ear
l
y-f
a
i
l
u
re'
i
nto
.
.
.
commit
|
commitdiff
|
tree
next