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 'sr/maint-fast-import-tighten-option-parsing' into maint
2011-05-16
Junio
C Hamano
Merge branch 's
r
/mai
n
t-fast-import-tighte
n
-o
p
t
ion-parsin
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch
'jc/t1506-sh
e
ll-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Hamano
Merge
b
ranch 'jc/f
i
x-ad
d
-u-unmerged' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
M
e
rge bran
c
h 'j
n
/g
i
tweb-depende
n
c
y'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bran
c
h 'jc/maint-branch-mergeop
t
ions'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
H
am
a
no
Merge branch 'jc/maint-add-p-
o
verla
p
p
i
ng-hunks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
i
o
C Hamano
Update draft relea
s
e no
t
es to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
a
m
ano
Merg
e
branch 'c
n
/forma
t
-pat
c
h-quiet' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branc
h
'jm/m
e
rgetool-submod
u
les' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
ano
Merge b
r
an
c
h 'jk/
f
ormat
-
patch-q
u
ote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
H
a
mano
Merge branch
'vh/git-svn
-
doc' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_noatime(): dr
o
p unused parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
Hamano
s
ha1_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio 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 Hamano
M
e
rge bra
n
ch 'aw/maint-
r
e
b
ase-i
-
p-no-ff' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C Hamano
Merg
e
bran
c
h 'js/blame-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Merge branch
'gr/cvsimpor
t
-
a
lternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge bra
n
ch '
c
j/p4merge' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch 'jk/me
r
ge-one-file-wo
r
kin
g
-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge
branch 'jc/fix-diff-files-unmerged' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
b
r
anch 'mz/
m
aint-ren
a
me-un
m
erged
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Hamano
t1507: avoi
d
"${parameter<
o
p>'word
'
}" i
n
side double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
H
amano
t3701: add-p-
f
ix makes t
h
e l
a
st test
to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
merge: make branch
.
<name>
.
mergeoptions correctly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ham
a
no
t3701: fix here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
G
it 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jh/dirstat'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
ano
Merge bra
n
ch 'sp
/
maint
-
clear-post
f
ields' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merg
e
branch
'
jk/maint
-
stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ha
m
ano
Merge
branch 'jk/maint
-
uploa
d
-pack-shal
l
ow' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C H
a
mano
Merge branch 'dm/stas
h
-k-i-p' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ham
a
no
M
erg
e
branch
'
jc
/
p
a
ck-ob
j
e
c
ts-bigfile' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch '
m
g
/r
e
fl
o
g-wi
t
h
-options'
into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branc
h
'jk/st
a
sh-loose
n
-
safety' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge bran
c
h 'ar/c
l
e
an-rmdir-e
m
pty' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
e
rge bran
c
h 'mg/sha1-pa
t
h-advise' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
"add -p": work-aroun
d
an old laziness tha
t
do
e
s n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hama
n
o
a
d
d--intera
c
t
i
ve
.
perl: factor out repeated --
r
ecount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Ha
m
ano
t
3
701:
Editing a sp
l
it hunk
i
n an "add -
p
"
session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
add -p: 'q' should
real
l
y
quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
Sta
r
t 1
.
7
.
5
.
1 maintenan
c
e t
r
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Me
r
ge branch 'mg/x-years-12
-
months' into maint
commit
|
commitdiff
|
tree
2011-04-26
J
uni
o
C
Hamano
http: clear P
O
ST
F
IELDS when in
i
tializing a sl
o
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C H
a
ma
n
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o
C
Hamano
Fix "add
-u
"
t
h
a
t
somet
i
m
e
s fails to resolve unmerge
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
f
f
-
files: show unme
r
ged entries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
diff: remove ofte
n
unused parameters from diff_
u
nmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
di
f
f
.
c: r
e
turn filepai
r
fr
o
m
diff_un
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
tes
t
: use $_z40 from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
5-rc3
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
Junio
C Ha
m
ano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
unio C Ha
m
a
no
R
evert "run-command:
pretti
f
y -D
_
FORTIFY_SOURCE workar
o
und"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge
b
ranch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-04-13
J
unio
C Hamano
Git 1
.
7
.
5-r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hamano
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
ano
Merge br
a
nch 'j
c
/rev-l
i
s
t-options-fix' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
e
r
g
e
b
ranch 'js
/
checko
u
t-u
n
tr
a
cked
-
s
y
mlink
'
into main
t
commit
|
commitdiff
|
tree
2011-04-12
Junio C Ha
m
a
n
o
M
erge bra
n
ch
'js/c
h
eckou
t
-untracked-symlink
'
commit
|
commitdiff
|
tree
2011-04-12
J
u
n
i
o C Haman
o
M
erge branch
'
nd/init-gitdi
r
'
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hama
n
o
Merge git://git
.
bogom
i
ps
.
org/git
-
svn
commit
|
commitdiff
|
tree
2011-04-11
J
un
i
o C
Hamano
Merge git://git
.
kernel
.
org/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
Gi
t
1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Ha
m
ano
S
yn
c
with
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
G
i
t 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C
H
amano
M
e
r
g
e
branch
'
nm/
m
aint-conflic
t
ed-su
b
module-entr
i
es
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
Merge branc
h
'mg/rev
-
list-n
-
reverse-d
o
c'
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Merge branch 'jk/maint-remote
-
mirro
r
-safer'
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Merge branch 'mg/
d
oc-rev
i
sions
-
txt'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
a
n
o
Teach co
r
e
.
bigfil
e
threa
s
hold
t
o
pa
c
k-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C Hamano
Me
r
ge
b
ran
c
h 'jl/submo
d
ule-fetch
-
on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ham
a
no
Merg
e
branch 'jc/rev
-
list-options-f
i
x'
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio
C
Ha
m
ano
Merg
e
bra
n
ch 'nm
/
m
aint-
c
o
n
f
licted-submodule
-
e
n
tries'
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hama
n
o
S
t
art preparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'jc/index-update-
i
f
-able' i
n
to maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
a
no
Merge br
a
nch '
l
t
/defau
l
t
-
abbrev' into
main
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hama
n
o
Merge
b
ra
n
ch 'jc/maint-rev-list-culled-
b
ounda
r
y'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Ha
m
ano
M
e
r
ge branch
'mm/maint-log-n-with-d
i
ff-
f
iltering' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
rge branch
'
jk
/
format-patch-multilin
e
-header' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
amano
Mer
g
e branch 'jn/m
a
int-instawe
b
-plack-fix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io
C Hamano
Merge branch 'lp/config-vername-c
h
e
ck' into maint
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Hama
n
o
U
p
d
ate release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C
H
amano
Sync wi
t
h 1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
man
o
Git 1
.
7
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Doc: ment
i
o
n --del
t
a-b
a
se-
o
ffset is the def
a
ult for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o
C
Ham
a
no
M
e
rge
b
ra
n
ch
'
nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge branch 'jc/merge-sans-branch'
commit
|
commitdiff
|
tree
2011-04-02
Ju
n
io C Hamano
Merge branc
h
'jr/grep-en-config
'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
M
erge
b
ranch
'ab/i18n
-
st'
commit
|
commitdiff
|
tree
2011-04-02
Junio
C Hamano
Merge
branch 'jk
/
pul
l
-int
o
-empty'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge bran
c
h
'
sb/
s
parse-more'
commit
|
commitdiff
|
tree
2011-04-02
J
u
nio C Hamano
M
erge
branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Mer
g
e branch '
n
d/index-
d
oc' into
m
a
int
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hama
n
o
Me
r
ge branch 'p
k
/s
t
ash-apply-sta
t
us-relative
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge branch 'jc/mai
n
t-diff
-
q-filt
e
r' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
u
n
io C Hamano
Merge bran
c
h 'js/mai
n
t
-
stash-
i
nd
e
x
-
copy' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
unio C H
a
mano
Merge br
a
nch 'mg/doc
-
b
isect-t
w
eak-wo
r
k
t
ree'
i
nto
maint
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o
C
H
aman
o
Me
r
ge branc
h
'
j
h/maint-do-not-tr
a
ck-non-branch
e
s' into
.
.
.
commit
|
commitdiff
|
tree
next