repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Fix for --merge-order, --max-age interaction issue
2005-06-20
J
on S
e
ymour
[PATCH] Fix for --mer
g
e-
o
rder,
--max
-
age interaction
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
Jo
n
S
e
ymour
[PATCH]
Pre
v
ent git-rev-l
i
s
t without --merge-orde
r
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
Jon Seymour
[PATC
H
]
Preven
t
g
it-rev-list --merge-order p
r
oduci
n
g
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
J
on
S
e
y
mour
[PATCH] Relaxes error checking in epoc
h
.
c
t
o allo
w
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
J
o
n
S
e
ymour
[PATCH] Fixes prob
l
em with
-
-
m
erge-order h
e
a
d ^head
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
Jon Seymour
[PATCH]
T
w
e
aked --merge-order --show-
b
reaks output
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
J
o
n Seymour
[P
A
TCH]
Additiona
l
git-rev-li
s
t un
i
t tests to
d
emonstrate
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
Junio
C H
a
mano
[PATCH] Rework -B output
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
Junio C
Hamano
[PATCH] Upd
a
te d
i
ff
d
ocu
m
entat
i
o
n
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
Junio C Hamano
[PATCH] Make -C less eager
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-20
Linus T
o
rvalds
Make "git
commit"
c
lean up a
f
ter
itsel
f
commit
|
commitdiff
|
tree
2005-06-20
Linus Torvalds
Cle
a
n up MER
G
E_HEAD and ORIG
_
HEAD als
o
for the
trivial
.
.
.
commit
|
commitdiff
|
tree
2005-06-19
P
anagi
o
tis
Issa
r
i
s
[
PATCH
]
cvs2git
.
c: support incremental conversion
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-19
Sven Verdoolaege
[
PATCH] ssh
-
p
ush
.
c: Fix h
a
ndli
n
g of ssh://host/path
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-19
Linus Torvalds
g
it-co
m
mit-tree: ignore
d
u
plicate parents
commit
|
commitdiff
|
tree
2005-06-19
Linus T
o
rva
l
ds
Fix up
INSTALL and "git add
"
commit
|
commitdiff
|
tree
2005-06-19
Linus To
r
v
a
ld
s
read-c
a
che
.
c: remove
stray
debugging print
f
commit
|
commitdiff
|
tree
2005-06-19
Li
n
us Torva
l
ds
Re-imp
l
ement "check_file_directory_
c
onflict()"
commit
|
commitdiff
|
tree
2005-06-19
Linus Torvalds
A
v
oid warning about functio
n
withou
t
return
.
commit
|
commitdiff
|
tree
2005-06-18
Sven Verdoolaege
[
P
ATC
H
]
cvs2git and file
p
ermiss
i
ons
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-18
Linus Torvalds
Make "pretty"
com
m
it logs
a
lw
a
ys show merge informa
t
i
o
n
commit
|
commitdiff
|
tree
2005-06-18
Linu
s
Tor
v
alds
git-rev-list
:
ad
d
"
--
b
isect" flag to fi
n
d the "halfway
.
.
.
commit
|
commitdiff
|
tree
2005-06-17
Linus
T
orvalds
Use "-M" instead of
"-C" for "git
d
iff" and "gi
t
s
t
a
t
u
s"
commit
|
commitdiff
|
tree
2005-06-17
Linus Tor
v
a
l
ds
git
-
apply: use default name for mo
d
e
c
han
g
e patches
commit
|
commitdiff
|
tree
2005-06-17
Linus Torvalds
D
o
n't use -C in "git diff"
commit
|
commitdiff
|
tree
2005-06-17
Linus Torvalds
Add some in
s
tallatio
n
no
t
es in INST
A
L
L
commit
|
commitdiff
|
tree
2005-06-15
Linus Torvalds
git-read-tree: fix "--reset" handli
n
g
commit
|
commitdiff
|
tree
2005-06-15
L
i
nus
Torvalds
Update tutori
a
l a bit for
scripted he
l
pers
.
commit
|
commitdiff
|
tree
2005-06-15
Li
n
us
T
orvalds
T
r
ivial git scrip
t
f
ixups
commit
|
commitdiff
|
tree
2005-06-14
S
ven Verdoola
e
g
e
[PATCH] s
s
h-pu
s
h:
D
on't add
'
/
' to pathname
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-14
Mark Allen
[
PA
T
CH
]
Unset TZ
in
t50
0
0
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-14
Li
n
us Torvalds
Make
'
g
it'
scr
i
pt be a bit m
o
re helpful on u
n
recognized
.
.
.
commit
|
commitdiff
|
tree
2005-06-14
Linus T
o
rvalds
M
a
ke "git commit" handle initial commits too
commit
|
commitdiff
|
tree
2005-06-14
L
inus To
r
valds
git-appl
y
: n
o
rmalize
file mode when compa
r
i
ng with
.
.
.
commit
|
commitdiff
|
tree
2005-06-13
Linus Torvalds
Add "git diff" script
commit
|
commitdiff
|
tree
2005-06-13
Lin
u
s Tor
v
a
l
ds
Teach git-rev
-
p
a
r
se about revi
s
ion-spec
i
f
y
i
ng arg
u
ment
s
commit
|
commitdiff
|
tree
2005-06-13
Lin
u
s Torvalds
gi
t
-wha
t
ch
a
nged: use
t
he
g
i
t
-rev-
p
ar
s
e
helper
commit
|
commitdiff
|
tree
2005-06-13
Linus
Torvalds
g
i
t-r
e
v
-parse: split "revs" and
"
no
n
-rev
s
"
commit
|
commitdiff
|
tree
2005-06-13
Linu
s
Torvald
s
Make "git log" use the new
git-re
v
-parse helper
commit
|
commitdiff
|
tree
2005-06-13
L
i
nus Torvalds
Add 'git-rev-p
a
rse' helper script
commit
|
commitdiff
|
tree
2005-06-13
Lin
u
s
Torvalds
g
i
t-appl
y
:
f
i
x
error handling for nonexistent files
commit
|
commitdiff
|
tree
2005-06-13
Tommy
M
.
McGuire
[PATCH] git cvsimpo
r
t
fuz
z
argumen
t
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Tommy M
.
McG
u
ire
[PA
T
C
H] c
v
s-
m
i
grat
i
on
.
txt
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Tommy M
.
McGui
r
e
[P
A
TCH] git cvsimport sanity checking
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
T
o
mmy M
.
McGu
i
re
[
P
ATCH] cv
s
import:
a
llow remot
e
CVS repos
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Jun
i
o C
Hamano
[PATCH]
d
iff-stages: unuglify the too big
main() fun
c
tion
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C
Ham
a
no
[PA
T
C
H
] read-tree: loosen to
o
stri
c
t i
n
dex r
e
quire
m
en
t
s
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C H
a
mano
[P
A
TCH] Finish
m
aking --e
m
u
23
e
q
u
ivalent to
p
ure 2
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Ju
n
io C
Hamano
[P
A
TCH
]
read-tre
e
: fix too stron
g
index r
e
q
uireme
n
t
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
J
u
n
i
o
C Hamano
[PATCH]
read-tree --e
m
u
23
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C Ha
m
ano
[PATCH] Clea
n
u
p
read-t
r
ee t
w
o-
w
ay tests
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C Hama
n
o
[PATCH] Add --diff-
f
ilter= out
p
u
t restriction to diff
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C Hamano
[PATCH] di
f
f
-tree: --fi
n
d-copi
e
s-harder
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C
H
amano
[PATCH] Tutor
i
al update to adjust for -B fix
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio
C
Hama
n
o
[PATCH] Fix rename/copy when dealing with te
m
porarily
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Lin
u
s
Torval
d
s
g
i
t
-what
c
h
anged:
make default o
u
tput format be pret
t
y
.
commit
|
commitdiff
|
tree
2005-06-13
Linus Torvalds
git-
d
iff-t
r
ee: f
i
x o
u
tp
u
t
w
ith j
u
st "--prett
y
"
.
commit
|
commitdiff
|
tree
2005-06-13
Junio
C
Hamano
[PATCH] Support commit_format in diff-tree
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio
C
H
aman
o
[PATCH]
R
e-Fix SI
G
SE
G
V on unmerge
d
files in git
-
di
f
f
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-12
Linus Torvalds
git-apply:
igno
r
e empty git
heade
r
s
commit
|
commitdiff
|
tree
2005-06-10
Jun
i
o C Hamano
[PATCH] Bugfix: read-cache
.
c
:w
r
ite_cache() misrecords
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-09
L
i
n
u
s
T
orv
a
lds
git-r
e
a
d-tree: r
e
move delete
d
files i
n
t
h
e working
.
.
.
commit
|
commitdiff
|
tree
2005-06-09
J
u
nio
C
H
a
mano
[
PATCH] Add
g
it-diff-stages
c
ommand
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-09
Linus To
r
valds
gi
t
-re
a
d-
t
ree: add "--reset" flag
commit
|
commitdiff
|
tree
2005-06-09
Linus Torvalds
One more ti
m
e
.
.
C
l
ean up
g
i
t-me
r
ge-one-file-
s
cript
commit
|
commitdiff
|
tree
2005-06-09
Li
n
us Tor
v
a
lds
Fi
x
up git-merg
e
-o
n
e
-file-script
commit
|
commitdiff
|
tree
2005-06-08
Linus
Torvalds
Mer
g
e
m
y and Petr's git-
m
erge-one-f
i
le-script modifications
commit
|
commitdiff
|
tree
2005-06-08
P
e
t
r
B
a
udis
[PATC
H
] g
i
t-merge-o
n
e-fi
l
e-s
c
ript cleanups f
r
om
C
o
g
it
o
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Linus Torvalds
Mak
e
s
u
re we error
out if w
e
can't
r
emove
a file on
.
.
.
commit
|
commitdiff
|
tree
2005-06-08
P
e
tr
B
audis
[PA
T
C
H] T
i
dy u
p
som
e
r
e
v-li
s
t-related stuff
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Junio C Hamano
[PATC
H
] Add read-tree -m 3-way merge tests
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Petr Bau
d
is
[
PATCH]
Fix git-merge
-
one-fil
e
permissions auto
-
merging
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Linus T
o
r
v
alds
Remove MERG
E
_HEAD after c
o
m
mitting merge
commit
|
commitdiff
|
tree
2005-06-08
Linus T
o
rvalds
Make "
g
it commit"
w
ork correctly in the presen
s
e of
.
.
.
commit
|
commitdiff
|
tree
2005-06-08
Linus
T
or
v
alds
cvs-migr
a
t
i
on: a
d
d more of a header to t
h
e "an
n
otate
.
.
.
commit
|
commitdiff
|
tree
2005-06-08
C
h
ristian
Med
e
r
[PATCH] Mi
n
is
c
ule co
r
r
e
ction of diff-for
m
at
.
txt
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Jas
o
n McMullan
[PAT
C
H
]
An
a
l
retenti
v
e
'
const unsig
n
ed ch
a
r *sha1'
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Jonas Fonse
c
a
[PATC
H
]
git
-
diff-cache: handle paths
p
ec
b
egi
n
ni
n
g with
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Linus Torva
l
ds
Lea
v
e merge failures
i
n the
f
ilesy
s
te
m
commit
|
commitdiff
|
tree
2005-06-08
Linus T
o
r
va
l
ds
F
ix SIGSEG
V
on u
n
merged files in git-diff-files -
p
commit
|
commitdiff
|
tree
2005-06-08
Junio C Hamano
[P
A
TC
H
]
Tes
t
s: re
a
d-tree -m test updates
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Linus Torvald
s
Make default merge messag
e
s denser
.
commit
|
commitdiff
|
tree
2005-06-08
Jon Seymour
[PATCH] three --merge-order bug fixes
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Sven
Verdoolae
g
e
[PATCH
]
git-cvs2
g
it: creat
e
tags
commit
|
commitdiff
|
tree
2005-06-08
Linus
T
orvalds
git-apply: creatign
e
m
p
ty
f
ile
s
is nonfatal
commit
|
commitdiff
|
tree
2005-06-07
Linus
T
o
rval
d
s
T
a
lk about "
g
it
c
vsimport" in
the
cvs migr
a
tion docs
commit
|
commitdiff
|
tree
2005-06-07
Ju
n
io C H
a
mano
[PATCH] Documenta
t
io
n
:
d
escribe diff
t
w
e
a
kin
g
(fix)
.
commit
|
commitdiff
|
tree
2005-06-07
Junio C Ha
m
ano
[PATCH]
S
tart
c
vs-m
i
g
ration documentation
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Li
n
us Torvalds
git-re
a
d
-
tree: -u with
o
ut -
m
is m
e
aningless
.
Don'
t
.
.
.
commit
|
commitdiff
|
tree
2005-06-07
Linus Torvalds
git-read-
t
r
ee: make o
n
e-way merge a
l
so honor
the "upda
t
e
.
.
.
commit
|
commitdiff
|
tree
2005-06-07
Junio C Hamano
[PATCH] read-tree:
update documentation
f
or 3
-
way merge
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Linus Torvalds
Add
C
VS imp
o
r
t
s
cripts and progra
m
s
commit
|
commitdiff
|
tree
2005-06-07
Linus Torvalds
git-
s
s
h
-push/pul
l
:
usability impr
o
vements
commit
|
commitdiff
|
tree
2005-06-07
Timo Hirvonen
[PATCH] Use ntohs
instead of htons to con
v
ert ce_flags
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Ju
n
io
C Hamano
[PATCH
]
read
-
tree: save mor
e
u
ser has
s
le
s
during fast
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Daniel Barkalow
[PATCH]
Document g
i
t-ssh-p
u
ll and git-ssh-push
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Linu
s
Torvalds
git-res
o
lve-script:
stop wh
e
n the automated merge fails
commit
|
commitdiff
|
tree
2005-06-07
Linus Torvalds
M
a
ke fetc
h
/pull scripts ter
m
inate cleanly on errors
commit
|
commitdiff
|
tree
2005-06-07
Linus Torval
d
s
git-resolv
e
-script: don'
t
wa
i
t for thr
e
e sec
o
nds any
.
.
.
commit
|
commitdiff
|
tree
2005-06-07
D
a
n
i
el B
a
rkalo
w
[P
A
TCH] -w s
u
pport for
g
i
t-ssh-pull/push
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
next