repo.or.cz
/
git
/
mjg.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/maint-branch-mergeoptions' into maint
2011-05-16
Junio C Hamano
Merge br
a
nch 'j
c
/
maint-branc
h
-mergeop
t
ions'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge bra
n
ch '
j
c/mai
n
t
-a
d
d
-p-
o
v
e
rlappi
n
g-hunk
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Upda
t
e
d
raft release n
o
t
e
s to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Mer
g
e br
a
nch 'c
n
/
f
ormat-patc
h
-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Mer
g
e b
r
anch '
j
m/mergetool-submodul
e
s' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hama
n
o
Merge branch 'jk/format-patch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'v
h
/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
git_ope
n
_noa
t
ime
(
): drop unused parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
sha1_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Ham
a
n
o
Prepare for
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'aw/maint-rebase-i-p-no
-
f
f
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
aman
o
Me
r
ge branch
'
js/blame-
p
a
rsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
M
e
r
g
e
bra
n
ch
'g
r
/cvsimport-alternative-cvsp
a
s
s
-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
man
o
Merge branch 'cj/p4
m
e
r
ge'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Mer
g
e branch 'jk/merge-one-file-wor
k
ing-tree'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
M
erge branch 'jc/
f
ix-diff-
f
iles-unmerg
e
d' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
m
z
/
ma
i
nt-rena
m
e-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-08
J
unio C Haman
o
t3
7
01: add
-
p-fix makes
t
he
last test t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
H
a
mano
merge: make branch
.
<name>
.
mergeoption
s
correctly overri
d
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
t
3701:
f
i
x
her
e
document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C H
a
mano
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge
bra
n
ch
'
jh/dirst
a
t' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch '
s
p/
m
aint-clear-p
o
stfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-s
t
ash-oob
'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'j
k
/maint-upload-pa
c
k-shal
l
ow' into
main
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branch 'dm/sta
s
h-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge branch 'jc/pack-objects-bigfile' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
a
m
ano
Merge branch 'mg/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'jk/stash-loo
s
en-s
a
fet
y
' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C Hamano
Merge br
a
nch 'ar/c
l
ean
-
rmdir-empty
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
H
am
a
no
M
erge bran
c
h 'mg
/
sha1-
p
ath-
a
dvise'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p": work-around
a
n old laziness that does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Haman
o
add--
i
nteractive
.
perl: fa
c
t
or out repeated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C
H
a
m
ano
t3701: Editing
a
s
pl
i
t hunk
in
an "add
-
p" sess
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
m
ano
ad
d
-p: 'q' should r
e
all
y
quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C H
a
mano
St
a
rt 1
.
7
.
5
.
1 mainten
a
nc
e
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
Me
r
ge bra
n
ch 'mg/x
-
y
e
ars
-
12-months' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: clear P
O
STFIELDS when initi
a
liz
i
n
g
a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
G
it 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-files: show unme
r
g
e
d entries
c
orrectl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Hamano
diff: rem
o
ve o
f
ten unused par
a
meters from diff_un
m
erge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
amano
d
iff
.
c: return filepair
from dif
f
_unme
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
test: use $_z40 from test-lib
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
J
unio C Hamano
Sync
w
ith 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
Junio C Hamano
R
e
v
ert "
r
un-com
m
a
nd: prettify -D_FORTIFY_SOURCE workaroun
d
"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Ha
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Git 1
.
7
.
5-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C
Hamano
M
erge b
r
anch 'jc/rev-l
i
st-option
s
-fix' i
n
to maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
Merg
e
branch 'j
s
/
checkout-
u
n
tracked-
s
ymlink' into maint
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge bran
c
h
'js/checkout-untr
a
cked-sym
l
ink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Ha
m
ano
M
e
rge branch 'nd/init-
g
itd
i
r'
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Hamano
Merge git:
/
/git
.
b
o
gomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Jun
i
o C Hama
n
o
Mer
g
e git
:
/
/
git
.
kern
e
l
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
ma
n
o
Git
1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Haman
o
G
it 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Ham
a
no
M
erge branch 'n
m
/ma
i
nt-confl
i
cted
-
submodu
l
e-entri
e
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
M
e
rg
e
br
a
nch 'mg/re
v
-
list-n-re
v
erse-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch
'jk/main
t
-remote-mirror-safe
r
'
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Ha
m
ano
Merge branch 'm
g
/
d
oc-revi
s
ions-tx
t
'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach core
.
bigf
i
lethreashold to pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C Ham
a
no
M
erge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2011-04-04
Juni
o
C Hamano
M
e
r
ge branch 'jl/s
u
b
module-f
e
t
c
h-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
i
o
C Ha
m
ano
Merge b
r
anc
h
'jc/rev-l
i
st-options-fix'
commit
|
commitdiff
|
tree
2011-04-04
Juni
o
C
Hamano
M
erge branch
'nm/maint
-
c
o
n
flicted-submodule-en
t
rie
s
'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
ano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Hamano
Start
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 br
a
nc
h
'jc/index-update-if-a
b
le' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C Hama
n
o
Mer
g
e
branc
h
'lt/de
f
ault-abbrev' int
o
main
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
rge bra
n
ch '
j
c/maint
-
rev-l
i
s
t
-cu
l
led-boundary'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Ham
a
no
Merge branch 'mm/maint-log-n-w
i
th
-
d
i
ff-fil
t
ering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hamano
Merge branch 'jk/forma
t
-patch-multi
l
ine
-
header' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C Hamano
M
e
rge branch
'
jn/maint-inst
a
web-plack-fix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
m
an
o
M
e
r
g
e bra
n
ch 'lp
/
config-ver
n
ame
-
check'
into
maint
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hama
n
o
U
pdate releas
e
notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C Hama
n
o
Sync with 1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Junio C Haman
o
Git 1
.
7
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o
C
Ham
a
no
D
o
c
:
m
enti
o
n -
-
delta-base-off
s
et is t
h
e def
a
ult for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-02
Junio C
Hamano
Merge bran
c
h '
n
d/ini
t
-gi
t
d
i
r
'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o C Hamano
Merge branch 'j
c
/
merge-sa
n
s-branch'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Me
r
ge
b
ra
n
ch
'
jr
/
g
r
ep-en-config'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge branch 'ab/i
1
8n-st'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hama
n
o
Merge branch 'jk/
p
ull-into-em
p
ty'
commit
|
commitdiff
|
tree
2011-04-02
Juni
o
C Hamano
M
e
r
ge branch 'sb/s
p
ar
s
e
-
more'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C Hamano
Merge bran
c
h 'nd/index-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o C Haman
o
Merge
b
ranch 'pk/stash-
a
pply-
s
tatus-relative' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C
Ha
m
an
o
Merge b
r
anch 'jc/maint-diff
-
q-fil
t
er' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-04-01
Junio
C Hamano
Merge
branch 'js/maint-stash-index-copy' into maint
commit
|
commitdiff
|
tree
2011-04-01
J
unio C
H
amano
M
erge bra
n
ch '
m
g/doc-bisect-t
w
eak-worktree' into
m
ain
t
commit
|
commitdiff
|
tree
2011-04-01
Junio C
H
amano
Merge branch
'jh/maint-do-not-
t
rack-non-branches' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge b
r
anch 'fk/maint-cvs
i
mport-early-fai
l
ur
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
u
n
i
o C Hamano
Merge
b
ranch 'jc/maint-apply-r
e
p
o
r
t
-offs
e
t' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge
b
r
a
n
ch 'j
c
/maint-apply-
n
o
-
doubl
e
-
pat
c
h' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
unio C Hamano
Merge bra
n
ch 'js/checkout-
u
n
t
ra
c
ked-syml
i
n
k
' into
maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Ha
m
ano
M
erge "ch
e
ckout a
m
bigu
o
us ref bugfix"
i
nto maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hama
n
o
"l
o
g
--ch
e
r
r
y
-
p
ick" doc
u
mentat
i
on regressi
o
n fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next