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 'jn/update-contrib-example-merge'
2010-09-03
Jun
i
o C Hamano
Me
r
g
e
b
r
anch 'jn/updat
e
-con
t
rib
-
e
x
ample-merge'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C Hamano
Merge branch 'jn/me
r
ge-re
n
o
r
malize'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Sync w
i
th 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C
H
a
m
ano
G
i
t 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Thiago
F
a
r
ina
builtin/merge_recur
s
ive
.
c
: Add an u
s
a
g
e st
r
ing a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Je
n
s Lehmann
t7406 &
t
7407: add missing && at end
o
f
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7
4
05: cd i
n
s
i
de subshel
l
instead of ar
o
und
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C H
a
mano
P
repare
for
1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
H
amano
M
erge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2010-09-01
Junio
C Hamano
Prepare
f
o
r 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merg
e
bran
c
h 'gp/pack-re
f
s-remove-empty-dirs' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
un
i
o C H
a
mano
Merge branch 's
g
/
r
erere-gc
-
old-st
i
ll
-
used' into maint
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C H
a
mano
Me
r
ge
branch 'n
p
/maint-huge-delta-gener
a
tion' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio
C
Ham
a
no
M
e
r
ge
branch 'dj/fetch-tagopt' into
maint
commit
|
commitdiff
|
tree
2010-09-01
J
uni
o
C Hamano
M
e
rge br
a
nch 'da/fix-submodule-sy
n
c-superpro
j
ect-config
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C Hamano
Merge bra
n
ch 'en/reb
a
se-against-r
e
base-fix'
into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
install-web
d
oc: f
i
lter timestamp-only changes c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
J
unio C Hama
n
o
Merge branch 'np/m
a
i
n
t-
h
uge-d
e
lta-gene
r
ation
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'da/
f
ix-submodule-sync-sup
e
rproject-config'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
i
o C Hamano
Merg
e
b
r
anch 'jn/c
h
erry-rever
t
-message-
c
le
a
n-up'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Ham
a
no
Merge branch 'cb/binar
y
-patch-id'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Hama
n
o
Merge b
r
anch 'ab/mai
n
t-reset-m
i
xed
-
w-pat
h
spec-advice'
commit
|
commitdiff
|
tree
2010-08-31
J
u
n
io C Hamano
Merge
b
ranch 'd
j
/
fetch-tagopt
'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C
H
am
a
no
Merge branch 'en/d-f-conflict-
f
ix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'jn/
s
vn-fe
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Me
r
ge
bra
n
ch 'tr/ma
i
nt-n
o
-un
q
u
o
te-plus'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hamano
Merge b
r
anch '
j
n/
p
aginate-fi
x
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
e
rge
b
ranch 'jn/m
a
int-
s
etup-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
e
rg
e
bra
n
ch 'en
/
fast-expor
t
-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branc
h
'hv/au
t
osquash-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merg
e
bran
c
h
'sg/rerere-gc-old-
s
till-use
d
'
commit
|
commitdiff
|
tree
2010-08-31
An
d
e
r
s
K
a
se
o
rg
gitweb: Don'
t
di
e
_
e
rror in git_tag after a
l
r
eady prin
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Junio C
Haman
o
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-08-30
J
uni
o
C Hamano
Merge branch '
m
a
i
nt-1
.
7
.
1' into maint
commit
|
commitdiff
|
tree
2010-08-30
T
hiago Farin
a
ob
j
ect
.
h: A
d
d OBJ
E
CT_AR
R
AY_
I
NIT
m
a
c
ro and mak
e
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
M
a
t
t
hieu
M
oy
t0
0
03: ad
d
m
i
ssi
n
g &&
at end o
f
l
i
nes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-08-26
J
a
y
Soffian
for-each
-
ref:
f
ix objectname:
s
h
ort bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Newre
n
tree-
w
a
l
k: Correct bitrotted
c
omment about tree_en
t
ry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
L
inus Torvalds
Fi
x
'git log
'
early pag
e
r startup er
r
or case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Junio
C
Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-08-24
Jonathan Niede
r
parse-o
p
tions: clari
f
y P
A
RSE_OP
T
_NOARG d
e
s
cri
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan N
i
eder
t3
3
02 (no
t
es): Port
t
o Solaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Brian Gernhardt
t7610: cd inside subshell instead of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Jun
i
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Ralf
Wi
l
de
n
hues
T
ypos
i
n
c
o
d
e comme
n
ts, an error messa
g
e, docu
m
en
t
atio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
R
alf Wil
d
enhues
Typos in code co
m
ments, an error
m
es
s
ag
e
, documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Nico
l
as
P
itre
f
ix
>4GiB source delta assert
i
on fa
i
lure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C Hamano
Me
r
ge
b
ranch 'mm/rebase-i-exec'
commit
|
commitdiff
|
tree
2010-08-22
Jun
i
o C Hamano
Me
r
ge
b
r
anch 'gb/split-cmdline-errmsg'
commit
|
commitdiff
|
tree
2010-08-22
J
unio
C
Hamano
Merg
e
bra
n
ch
'
so/http-user-agent'
commit
|
commitdiff
|
tree
2010-08-22
J
uni
o
C Hamano
M
erge branch 'mm/s
h
o
r
topt-d
e
tached'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hamano
Me
r
ge b
r
anch '
s
r/loca
l
-config'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C
H
amano
Me
r
ge bra
n
ch 'nd/fix-sparse-check
o
ut'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hamano
M
e
rge branch 'hv/su
b
modul
e
-find-ff-merge'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C
H
amano
M
e
r
ge branch 'en/
r
ebase-against-rebase-fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge
b
ra
n
ch
'dg/local-m
o
d-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
J
u
nio
C
Hamano
Merge
br
a
nch 'po
/
userdiff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C
H
a
m
ano
M
erge branc
h
'
a
b/pe
r
l-install'
commit
|
commitdiff
|
tree
2010-08-22
Ævar Arnfjörð Bjarmason
re
s
et: s
u
ggest what to d
o
u
p
on "git reset --mixed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
un
i
o C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Jens
Lehmann
t74
0
3: ad
d
miss
i
ng &&'s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Ma
r
k
R
ada
Tell ign
o
re fi
l
e about generate files in
/gi
t
web/sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Hamano
M
e
rge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o
C Hamano
Merge
branch 'jc/ma
i
nt-fo
l
low-rena
m
e-
f
ix'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C Hama
n
o
M
e
rge br
a
nch 'jn/maint-plug
-
leak' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C Hamano
M
e
rge
b
ranch
'
jn/
f
ix-abbrev' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge bra
n
ch 'vs/do
c
-s
p
e
l
l' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch
'jn/r
e
ba
s
e-rena
m
e-am' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
unio C
H
aman
o
Merge branch 'jn/
d
oc-pu
l
l' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio
C Hamano
Merge b
r
anch 'bc/u
s
e-more-h
a
rdlinks-
i
n
-
install'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Ju
n
io C Ham
a
n
o
Merge
branch 'tr/rfc-reset
-
doc'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar
R
ama
c
han
d
ra
built
i
n/checko
u
t
:
Fix m
e
ssage
when switching to an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu Mo
y
xmalloc: inclu
d
e
s
ize in the f
a
ilu
r
e m
e
s
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
merg
e
-recu
r
sive: Avoid
e
xces
s
ive outpu
t
f
o
r
and r
e
proc
e
ssing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Me
r
ge
b
ra
n
c
h
'mai
n
t' to
sync with 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ju
n
io C Hamano
Git
1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge br
a
nc
h
'tr/
x
size-bits' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-19
Junio C
H
amano
Merg
e
branch 'jc/sha1-name-find
-
f
i
x
'
into maint
commit
|
commitdiff
|
tree
2010-08-19
Ævar A
r
nfjörð Bj
a
rm
a
son
t/t9010-
s
v
n
-fe
.
s
h: ad
d
an +x bit to thi
s
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
man
o
Merge
branch 'sp/fix
-
smart-ht
t
p-dead
l
ock-on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge scr
i
p
t:
learn --[no-]r
e
rere-autoupdat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge
s
cript: not
i
ce @{-1} sh
o
rt
h
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge
script: ha
n
d
l
e
--no-ff --no-
c
ommit corr
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge scr
i
p
t
: --f
f
-only to disallow true
m
e
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
ieder
merge scri
p
t
:
handl
e
many-way
o
ctopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
N
i
eder
merge scr
i
pt: handle -m --l
o
g
correc
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: forbid merge -s index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than
N
ieder
merge
s
cr
i
p
t: allow custom st
r
ategi
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
de
r
merge script: m
e
rge -X<
o
ptio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scri
p
t: improve log mes
s
age sub
j
ect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onath
a
n Nieder
mer
g
e s
c
ript: re
f
u
se to merg
e
during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n Nied
e
r
merge script: tweak unmerged file
s
mess
a
ge to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
ieder
me
r
ge
script:
-
-squash, --ff
f
ro
m
unborn branch
a
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Nied
e
r
fmt
-
merge-msg -m to override merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nie
d
er
merge-base
--
i
n
d
ependent
t
o print reduced
pare
n
t list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an Nieder
mer
g
e
-
base --octopu
s
t
o
mimic show-bran
c
h --me
r
ge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nie
d
er
Document
a
tio
n
:
add a SEE ALSO
sec
t
ion
f
or m
e
rge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
t
h
an N
i
eder
t6
2
00 (fmt
-
merge-m
s
g)
:
st
y
le nitpi
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t601
0
(merge-base): mode
r
nize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next