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
Make merge comment git-pull makes for an octopus a bit prettier.
2005-09-14
J
u
nio C Hamano
Make me
r
ge c
o
mment git-p
u
ll ma
k
es for an octopus a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o C Hamano
read
-
tree
:
fix bogu
s
debuggin
g
stateme
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
git-merge-recu
r
sive:
Trivi
a
l RE fix
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uivin
e
n
[PATCH] U
s
e the 'die'
fun
c
tion wh
e
re it i
s
appropr
i
ate
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
T
C
H] Use a
temporary index file when we merge the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
Adjust git-
m
erge
-
r
e
cursive
.
py for the new
t
oo
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
Don
'
t output 'Auto
m
atic
m
erge failed,
.
.
.
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
ine
n
[PATCH]
B
e
m
ore l
i
ke the
'
resol
v
e' stra
t
egy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
a
m
ano
[PATCH]
D
efine relative
.
git/ob
j
ects
/
info/alternates
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C
H
amano
Detect ls-
r
emote failure proper
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kui
v
inen
[PATCH]
R
ename
t
he 'fredrik'
m
erg
e
stra
t
egy to 'r
e
cursive'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
a
n
o
Fix of
f
-
b
y-one error in
git-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Propagate errors from
f
e
tch-pack
c
orrectly to git-fe
t
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
no
Fix CD
P
ATH p
r
oblem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
Do
c
u
m
ent git-gr
e
p
an
d
li
n
k it from
the main git(
7
)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
[PAT
C
H] Make 'git checkout' a bit
more for
g
i
vin
g
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
i
o
C Hamano
[PATCH]
O
mit patches
t
hat
h
ave already b
e
e
n
m
erged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Horst von
Brand
[PAT
C
H]
There are se
v
eral undocumen
t
ed
d
ependen
c
ies
commit
|
commitdiff
|
tree
2005-09-13
Linu
s
Torvalds
I
m
prove
"
git grep" flags handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
A
TC
H
] Make the Program
E
rror class printable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[P
A
TCH] M
a
ke sure we die
i
f we d
o
n't get
e
n
ough
a
rguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivine
n
[
PATCH] I
n
t
ro
d
uce a '
d
i
e
' f
u
nct
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Ku
i
vinen
[PATCH] Exit wit
h
statu
s
cod
e
2 if we get an exceptio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
TCH] Fix
asser
t
i
o
n
failure w
h
en merging com
m
on
ancesto
r
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
All
o
w f
i
ndin
g
thi
n
gs that begin wi
t
h a dash in 'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Li
n
us Torv
a
lds
[
P
A
TCH] Add "git g
r
ep"
h
elper
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
L
inus Torvalds
[PAT
C
H] Add no
t
e abo
u
t IANA co
n
firmation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Use
i
n
t instead of s
o
ckle
n
_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Her
b
e
rt Xu
[PATCH] Apply N -> A status c
h
ange in diff
-
he
l
per
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PATCH] ar
c
himport
-
b
etter handling of temp dirs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PATCH] archim
p
ort - use GIT_DIR in
s
tead
o
f hardcoded
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
m
artin@c
a
talyst
.
.
.
[PATCH]
a
rchim
p
ort - update in-scr
i
pt doco,
options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
marti
n
@ca
t
alyst
.
.
.
[PATCH] archimp
o
rt documentation tidyup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@cata
l
yst
.
.
.
[PAT
C
H] archimport docume
n
tation update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Yasushi SHOJ
I
[PATC
H
] Escape asciidoc's
b
u
i
l
t-in em-dash repla
c
ement
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Qingning Huo
[PATCH] Fix buf
f
er ove
r
flow
in
ce_f
l
u
s
h
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Add
a
new merg
e
strate
g
y by Fre
d
ri
k
Kuiv
i
nen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
'git-merge':
D
ocumentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
H
a
m
a
no
Use Dani
e
l's
r
ead-t
r
ee in the
m
erg
e
strate
g
y
'
r
esolv
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C H
a
mano
Multi
-
bac
k
e
nd
merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
P
l
ug leak in Daniel
'
s read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATCH] Add debugging help for c
a
se
#16 to read-
t
ree
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o
C
H
a
mano
[PATCH] Disa
b
le
debug
g
ing fro
m
read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Daniel
B
ar
k
alow
[PATCH] Document
the tr
i
vial merge rules
f
or 3(+more
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Daniel B
a
rkalow
[PAT
C
H] Rewrite rea
d
-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Daniel B
a
rkalow
[
P
ATCH] Add f
u
nction to ap
p
end to an object_list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Da
n
iel Barkalow
[PA
T
CH
]
Add a functio
n
f
or gett
i
n
g a s
t
ruct tree
f
or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Ha
m
ano
Fix 'git-sho
w
-
branch --list <head>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io C Hamano
Add 'gi
t
bise
c
t r
e
play/log' documen
t
at
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ham
a
no
Keep bisection log
s
o that it can be
r
eplayed la
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C
Hamano
Fix copy marking
from diff
c
ore-
r
en
a
me
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
martin@
c
atal
y
st
.
.
.
[
P
A
TC
H
] ar
c
himport - add merge detection
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C Hamano
Make sure we have leading directori
e
s under refs/{heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Sv
e
n Verdoolaege
[PATCH] Docum
e
nt
a
tion/rep
o
sitory-layout
.
txt typo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
show-branch: --l
i
s
t and --i
n
depen
d
ent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
un
i
o
C
Ha
m
a
n
o
Re
t
ire support
for old envir
o
nment variables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C Hamano
Adjust
.
gitign
o
r
e
for big ren
a
me
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
M
a
rco Ro
e
land
[P
A
TCH]
r
emove dupli
c
a
t
e git-send-em
a
i
l-script
.
perl
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
jdl@freescale
.
com
[PATCH] fix tutorial t
y
po
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
jdl@fr
e
escale
.
co
m
[P
A
TCH] Fix tutor
i
al reference to git-
*
-scripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Hamano
I
g
nore datestamp-onl
y
changes
when in
s
tall
i
ng webdoc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
ni
o
C Hamano
S
q
uelch
`
removal' m
e
ssage from 'git res
e
t --h
a
rd'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hama
n
o
'buil
d
' scripts before in
s
talling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
J
u
nio C Ha
m
a
no
Show all merg
e
-base cand
i
dates from show-b
r
anc
h
--merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
J
uni
o
C
H
a
mano
Documentatio
n
update
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
l
ars
.
doelle@o
n
-li
n
e
.
de
[
P
A
TCH]
git-daemon --inetd
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
g
i
t
--versio
n
tells which ver
s
i
o
n of git you have
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Amos Wat
e
rland
[
P
AT
C
H] Do
n
o
t
c
reate b
o
gus
b
ra
n
c
h
from fl
a
g t
o
gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Patrick
M
auritz
[PATCH]
Portability fix for
Solari
s
10/x86
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Jun
i
o C
H
a
mano
Big tool rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Haman
o
GI
T
0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
David_K
å
gedal
[PATCH] Simplify
g
it script
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Jun
i
o C Ham
a
n
o
Docu
m
en
t
a
t
ion updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A
Large Ang
r
y SCM
[PATCH] D
o
cs for git-build-rev-cache
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large
A
n
g
ry S
C
M
[PATCH] Docs for
git-show-rev-c
a
ch
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A
Lar
g
e Angry SCM
[PATCH] Docs for git-reset-script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SCM
[PATC
H
] Docs for git-
c
hecko
u
t-script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Ham
a
no
Documentati
o
n updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
io C Hamano
F
l
att
e
n tools/ di
r
ect
o
r
y to make b
u
i
l
d procedure simpler
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Jun
i
o C
Haman
o
m
a
ilinfo: barf and ex
i
st upo
n
nested
m
ultip
a
rt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Merge branch 'm
a
s
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-06
Ren
e
Scharfe
[PATC
H
] Update docu
m
entation for
g
it-get-ta
r
-commit-id
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
H
.
Peter Anvi
n
[
P
ATCH]
git-cvsimport-script:
h
and
l
ing of t
a
gs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C
H
amano
Format
f
ix for
asciidoc docume
n
t
a
t
i
on
tit
l
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-05
J
unio
C Hamano
Reti
r
e git-clone-dumb-http
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Ry
a
n A
n
d
e
rs
o
n
[PATCH] U
p
date
d
ocum
e
nt
a
tion of --compos
e
to git-send
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
R
yan Anderson
[PAT
C
H] Ma
k
e git
-
send-
e
mail-script ignore some u
n
nece
s
sary
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
J
unio C Hama
n
o
I
nstall archimport-script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C H
a
mano
Merge br
a
nch
'
mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-04
Junio C
Ha
m
a
n
o
Add copy/rename
check for gi
t
-
appl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C
H
a
mano
Add
a
link fro
m
up
d
a
te-server-info d
o
cumentation to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Make git-apply
un
d
ersta
n
d incomplet
e
line
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Juni
o
C Ham
a
no
git
-
applymbox:
f
ix '-c'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Martin Langhoff
[
P
ATCH]
arc
h
import: avoid committing on an Arch tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Martin Langhoff
[PATCH] archimport autod
e
tects imp
o
rt status, supp
o
rts
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Sergey V
l
asov
[PA
T
C
H
] NUL t
e
rminate the
object data in pa
t
ch_delta()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Pe
t
er H
a
gervall
[PATCH
]
Poss
i
ble cleanups
f
o
r
l
ocal-p
u
ll
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Paolo 'Blaisorblade
.
.
.
[PATCH] Doc: replac
e
read-c
a
che with
g
it-read
-
tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-03
Ju
n
i
o
C Hamano
Document hooks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next