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
Use Daniel's read-tree in the merge strategy 'resolve'.
2005-09-11
J
unio C Hamano
Use D
a
niel's
r
ead-tree in th
e
mer
g
e strategy 'resol
v
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
Hama
n
o
M
u
lti-back
e
nd merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Hamano
Plug leak in Daniel's read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATC
H
] Add debugging help for case #16 to read-
t
ree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[
P
AT
C
H] Di
s
able
debugging from
read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Dani
e
l
B
a
r
k
alow
[
P
ATCH] Docum
e
n
t
the triv
i
al merge rules
for 3(+more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
D
aniel Bar
k
alow
[PATCH] Rewrite read-tr
e
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
D
a
niel Ba
r
kalow
[PATCH] Add
f
unction
to append to an object_list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel
Bark
a
low
[
P
A
T
CH] Add a
f
unct
i
on
f
o
r getting a struct tr
e
e for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C H
a
m
a
n
o
Fix '
g
it-sh
o
w-branch --list <he
a
d
>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
n
i
o
C
Ham
a
no
Add
'git bisect replay/log' documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C H
a
mano
Kee
p
bisection log so
t
hat i
t
can be rep
l
ayed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C
H
am
a
no
Fix copy marking
from diffcore-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
mar
t
i
n
@cata
l
yst
.
.
.
[PATCH] a
r
chimport
-
add merge detection
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Make sur
e
we
h
ave leading
d
irectori
e
s un
d
er
r
efs/{h
e
ads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Sv
e
n Verdoolaege
[PATCH] Docu
m
e
n
tati
o
n
/repository
-
layout
.
txt ty
p
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio
C
Hamano
show
-
branch: --lis
t
and --ind
e
pen
d
ent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Reti
r
e support
for old environment va
r
iables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
Ha
m
ano
Adjus
t
.
giti
g
nore for big ren
a
me
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Marco Roeland
[P
A
TC
H
]
remove
d
uplicate gi
t
-send-email-sc
r
ipt
.
perl
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
j
d
l@fre
e
scale
.
com
[PATCH]
f
ix
tutoria
l
typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jdl@f
r
eescale
.
com
[PATCH] Fix tu
t
orial
reference to gi
t
-
*
-
s
cr
i
pts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C Hamano
Ignore datestam
p
-only chan
g
e
s when inst
a
lling
w
ebdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
uni
o
C Hamano
S
q
uelch
`remov
a
l' message
from 'g
i
t reset --hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Haman
o
'build' scripts be
f
ore installing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Show all merge-b
a
se candidat
e
s fro
m
show-bra
n
c
h --merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
D
ocumentat
i
on updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
l
a
rs
.
d
o
el
l
e@on
-
line
.
de
[PATC
H
] g
i
t-d
a
emon --inetd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
git --version te
l
ls w
h
ich version
o
f
g
it you have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Amos Waterland
[PATCH] Do not create b
o
g
us branch from flag
t
o git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Patr
i
ck Maurit
z
[PATCH
]
P
o
rtability fix for Sol
a
ris
10
/
x86
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Ha
m
ano
Big t
o
ol re
n
a
me
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
GIT 0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
David_Kågedal
[PATCH] Simplify git
s
c
ript
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C
H
amano
Do
c
u
m
entation upd
a
te
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angr
y
S
C
M
[P
A
T
CH]
D
ocs for git-build-rev-cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SCM
[P
A
TCH]
D
ocs f
o
r
git-show-rev
-
cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Ang
r
y
S
CM
[P
A
TCH] Docs for git
-
reset-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large
Angr
y
S
CM
[P
A
TCH]
Docs for
g
it-chec
k
out-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Documentation upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C
H
a
man
o
Flatte
n
t
oo
l
s/ directory to make
b
u
ild p
r
ocedure simpler
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
J
u
nio
C
Hamano
mailinfo: barf and
exist upon nested m
u
ltipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
J
u
nio C
Hamano
Merge
branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-06
Rene Scharf
e
[PATCH] Update docum
e
ntatio
n
for git
-
g
e
t-tar-commit-id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
H
.
P
eter Anvin
[PATCH] git
-
cvsimport-script: handlin
g
of tags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Jun
i
o C Hamano
Format fi
x
f
or asciido
c
documentatio
n
t
itles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio
C
Ha
m
ano
M
e
r
g
e bran
c
h 'master' of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio
C
Hamano
Retire git-c
l
one
-
du
m
b-http
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[P
A
TCH] Upd
a
te
d
o
cumentation of --compose to git-send
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
R
y
an Anderson
[PATCH
]
Make
g
it
-
s
e
nd
-
ema
i
l-script ignore some unnecessary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio
C Hamano
I
n
stall
archimport-
s
cript
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C
H
amano
Merge branch
'master' o
f
.
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
i
o
C
H
amano
Add copy/
r
en
a
me ch
e
ck for git-app
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
io C H
a
mano
A
d
d
a link from
up
d
at
e
-server-info document
a
tion to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
d
r
ik
K
uivinen
[PATCH
]
Make git-apply
u
nde
r
stand incomp
l
ete lines
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Jun
i
o C Ha
m
ano
git-a
p
p
lymbox: fix '-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
M
artin
L
a
n
ghoff
[PATCH] arc
h
impo
r
t: avoid committing
on an Arch tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin Lan
g
hoff
[PATCH] ar
c
himport autodetects import status
,
supports
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
S
e
rgey V
l
asov
[PAT
C
H
]
N
U
L term
i
nat
e
t
h
e
obje
c
t data in patch_del
t
a()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Peter Hagervall
[PATC
H
]
Possible cleanu
p
s
f
o
r
local-pull
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Paolo 'Blaisorbl
a
de
.
.
.
[PATCH] Doc: repla
c
e
re
a
d-
c
ac
h
e w
i
t
h
git-read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
J
u
nio C Hamano
D
o
cument hook
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Haman
o
Merge b
r
anch '
m
ast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-02
Jun
i
o C Hamano
M
e
ntion post-update when we
f
i
rst
t
alk about publishing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C
Hamano
s
c
ripts: equa
l
ity
tes
t
'==
'
i
s
n
ot
p
ortable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Ha
m
ano
git-c
h
ec
k
o
u
t
-s
c
ript: R
e
move unnecessary va
r
iab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Ham
a
no
Fix automerge mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Amos Waterl
a
nd
[PATCH] E
x
p
l
ain what went
wron
g
on updat
e
-cache
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C Hamano
Add repository-lay
o
ut document
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C Hamano
Merge
refs/heads/master fro
m
.
commit
|
commitdiff
|
tree
2005-09-01
Ju
n
io
C Hamano
Use 'git status' no
w
i
t
can handle initial commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
Fix git-status when HEAD is
i
nvalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
J
u
nio
C
Hamano
Fix
g
it-log-s
c
ript when HEAD is invalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
Ad
d
P
i
ne
4
.
63 h
e
l
p f
r
om Daniel
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
Merge ref
s
/head
s
/mas
t
er fr
o
m
.
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
U
p
d
a
t
e
tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C H
a
mano
show-branch: m
a
ke it wo
r
k
in a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Martin Langhoff
[P
A
TCH] Initial import
o
f
git-archimpo
r
t-script
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C
H
amano
M
e
r
ge ref
s
/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
cat-file: make it work in a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
Do
c
umentai
o
n updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C Hamano
'git bi
s
ect visualize'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
L
i
nu
s
Torvalds
[PATCH] Fi
x
bisection
terminating
condition
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io
C
Hamano
Merg
e
refs/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io C
H
am
a
no
parse-remote: trivial f
i
x
to allow refs/{hea
d
s
,
tags
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io C Hamano
Merge re
f
s
/heads
/
master from paulus
commit
|
commitdiff
|
tree
2005-08-30
Junio
C
Hama
n
o
Make sure howto/*
.
html is built as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Linus Torvalds
[P
A
T
CH] Ma
k
e "git resolve" less scary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio
C
Haman
o
Merge refs/
h
e
a
ds/master from
.
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C H
a
mano
Allow asciidoc formatted documentation
i
n
h
ow
t
o/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio
C Hama
n
o
Merge re
f
s/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C Hama
n
o
Add [HO
W
TO] re
v
ert/branch/rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
g
i
t c
o
mmit: Allo
w
editing on all
occasions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Haman
o
Do not
v
erify reverte
d
/cherry-
p
icked/
r
eb
a
sed pat
c
h
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o
C
Hamano
Fix compi
l
atio
n
w
a
rnin
g
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
A L
a
rge Ang
r
y S
C
M
[PA
T
CH] Up
d
ate
T
hu
n
der
b
ird specific h
i
nts
.
commit
|
commitdiff
|
tree
2005-08-30
A La
r
g
e
Angry SCM
[P
A
TCH] Documentatio
n
for g
i
t-req
u
est
-
pul
l
-script
.
commit
|
commitdiff
|
tree
2005-08-30
A
L
arge
A
ng
r
y S
C
M
[PAT
C
H
] Documenta
t
ion fo
r
git-clone-du
m
b
-
http
.
commit
|
commitdiff
|
tree
2005-08-30
A
L
a
r
ge Angry SCM
[PATCH] Documentat
i
on fo
r
git-dae
m
on
.
commit
|
commitdiff
|
tree
2005-08-30
J
un
i
o
C
Ha
m
ano
M
erge r
e
fs/heads/maste
r
from
.
commit
|
commitdiff
|
tree
next