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
octopus: do not do AND'ed merge base.
2005-11-11
Junio C Hamano
octopus: do not do AND'ed merge bas
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
am
a
n
o
Add --pr
e
tty=fu
l
l
er
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C H
a
mano
Do not los
e
author name
i
n
f
o
r
m
a
tion to
l
o
cale gotc
h
as
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Hamano
Documentation: "host:p
a
th/to/repo" is git nativ
e
over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Josef Weidend
o
rfer
Let git-clone/git
-
fet
c
h f
o
llow
H
TTP
redirecti
o
ns
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
P
etr Baudis
Fix confus
i
ng
git-update-
r
ef error me
s
sage
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Jim Radford
A
d
d mi
s
s
i
ng
g
it-cor
e
a
n
d cvsps RPM dependencies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C Haman
o
Make git-recu
r
sive the default strategy for git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io C
H
amano
Use 'merge-base --all'
w
here
a
pplicabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C
H
amano
Merge
branch 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
Junio
C
Hamano
Merge bran
c
h '
h
old/rpm'
commit
|
commitdiff
|
tree
2005-11-09
J
u
n
io C
H
amano
git-apply:
d
o
not fa
i
l on binar
y
d
i
ff when
n
ot apply
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hamano
Update INSTA
L
L
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Ku
i
vin
e
n
me
r
ge-recur
s
ive: Fix support for b
r
anch name
s
c
ontaining
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kui
v
inen
merge-recu
r
sive: Fix l
i
mited output
of
r
ename messages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Alexander Litvinov
Fix cvsexportcommit synt
a
x e
r
ror
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Luck
,
Tony
Update
howto usi
n
g-topic-branches
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
P
eter
Hagerval
l
sparse f
i
x
es for http
-
{
f
e
t
ch,push}
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Kai Ruemmler
git-ta
g
-d <tag>: delete tag <tag>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Alex Riesen
make tests ignorable with "mak
e
-i"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Al
e
x Riese
n
fix t5
0
00-t
a
r-tre
e
.
sh when
$
TAR isn't
set
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Hamano
C
lean bu
i
ld
anno
y
ance
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jim
R
ad
f
ord
Separa
t
e RPMS for programs
with non-standar
d
dependen
c
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix a couple of obvious
and insignifica
n
t typo
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Y
aacov Akiba
S
l
ama
Lift
the defaul
t
limit of number of re
v
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov A
k
ib
a
S
l
a
ma
Handle a revision t
h
at only creates a n
e
w
tag correctly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaaco
v
Aki
b
a S
l
a
ma
Bundle f
i
le co
p
ies
f
rom multipl
e
branches into a
me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba S
l
am
a
c
opy_dir becomes copy_path
and handles both files and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akib
a
Slama
Don't out
p
ut error on changes in
t
he nod
e
s
/
, /
t
ags
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Sl
a
ma
Add node_kind f
u
nction to d
i
ff
e
rent
i
ate bet
w
een fil
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba S
l
ama
Use sv
n
pools to solve the memory leak problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C
Hamano
git-am: do not l
o
se already e
d
ited final-
c
o
m
mit w
h
en
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Alex R
i
e
sen
ls-files
a
n
d
read-tr
e
e need cor
e
.
f
i
lemode
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Debian: packa
g
ing updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeli
g
e
r
Use consistent she
l
l
p
rompts and exampl
e
s
tyle
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jon
L
oeliger
A
dd --ta
g
s docum
e
nta
t
io
n
,
sc
r
ap
e
d from JC mail
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
N
i
ck Hengeveld
A
dd support for git-htt
p
-
push
t
o g
i
t-push script
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
Hamano
T
utor
i
al: do not
u
se 'git
r
esolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
unio
C
H
amano
Documentatio
n
: fix dependency g
e
neration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeli
g
e
r
Add b
u
g i
s
olation howt
o
,
s
c
r
aped
f
rom Linus
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Ha
m
a
n
o
Ign
o
re more generated
f
iles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix d
o
cumen
t
at
i
on de
p
enden
c
y gene
r
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Hamano
Documentation: asciidoc formatting
f
ix
for git-cvsexportcom
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Fredr
i
k
K
u
i
vine
n
m
e
rge-recursive: Only print relevant rename m
e
s
s
ag
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Do not fail on hierarchi
c
al tagna
m
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Johannes
Schindelin
S
m
a
l
l bugfixes for h
t
tp-p
u
sh
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Nic
k
Hengeveld
Make htt
p
-
push smarter ab
o
u
t
c
r
eating
r
emote dirs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Marti
n
Langhoff
I
ntroduc
i
ng: git-cvsexpo
r
tcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
K
ai Ru
e
mmler
Documentation update: use gi
t
branch -d foo
where a
p
plicable
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
unio C
H
amano
Reco
v
er dro
p
p
ed +x
bit fro
m
git-pull
.
sh by acciden
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o C
Hamano
Doc
u
m
e
ntat
i
o
n: talk
about guts of mer
g
e
in tuto
r
ial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jon L
o
eli
g
er
Ref
a
ctored
m
e
r
g
e optio
n
s into se
p
arate
merge-
o
ptions
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Johannes Schindelin
h
t
tp-fetc
h
: do not us
e
curl_mess
a
ge after rele
a
s
in
g
it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
ohannes
S
chindelin
A
llo
w
GIT_D
I
R to
b
e an
absolute path
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Paul
Collins
h
ttp
-
push
.
c: include with angle
b
rack
e
t,
n
o
t dq
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Se
t
up remo
t
es/origin to
t
r
ack all rem
o
te b
r
anches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Ha
m
an
o
g
it-status: do n
o
t mark unme
r
ged paths as committable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o C Hamano
ls-fi
l
es: --others s
h
oul
d
not say unmerged paths are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
R
andal L
.
Schwartz
Use fink/
d
arwinport paths for
OSX
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jon Loel
i
ger
Refactor merge strate
g
ies int
o
separate inc
l
udable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
n
o
Document expat
dependency wh
e
n
u
sing http-push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
Merge in h
t
tp-push first stage
.
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengev
e
ld
R
efr
e
s
h th
e
remo
t
e lock if it is
a
b
o
ut
t
o expire
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick Heng
e
v
eld
Im
p
rove
lock hand
l
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
Support r
e
mote refer
e
nces wi
t
h slashes in their
n
ames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick
Heng
e
veld
Verify remot
e
p
acks, speed up
p
end
i
ng request queue
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
A
d
d support f
o
r
p
ushi
n
g
t
o
a
remote repository u
s
in
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Haman
o
D
e
bi
a
n: test bu
i
ld
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o
C
Hamano
Furt
h
er Debian split fixe
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
Install asciidoc
s
ourc
e
s as
w
ell
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
uni
o
C Haman
o
Package split: Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ha
m
ano
S
i
mpli
f
y
CFLAGS/DEFINES in M
a
kef
i
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
no
gi
t
-fe
t
c
h:
fail if
s
pecified refspec
d
oes not mat
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
Documentation: pull/clone ref mapping clarification
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Ha
m
ano
git-format-patch:
sil
l
y ty
p
o
fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
test: t41
0
2-apply-rename
f
ails
w
it
h
strict umask
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io C H
a
mano
git
-
clone: fix lo
c
al clone
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
ni
o
C Hama
n
o
init-db::copy_f
i
le() - use co
p
y_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
ma
n
o
copy
.
c::cop
y
_fd() - do not l
e
ak file descriptor on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
un
i
o C H
a
mano
Documentation: form
a
t-pa
t
ch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
ama
n
o
f
orma
t
-pa
t
ch:
"rev1
.
.
" should mean
"rev
1
.
.
HEAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C Hama
n
o
D
ocumentation:
g
it-fetch/pull updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
o
n Loeliger
Added a few examp
l
es to git-pull m
a
n
page
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o
C
H
a
mano
D
o
cument the
--no-commi
t
flag b
e
tter
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Ham
a
no
Docum
e
ntation: -merge and -pull: describe
me
r
ge str
a
teg
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C
H
ama
n
o
Docu
m
entation: git-add -- do n
o
t say
"
c
a
c
he", add
examples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C
Hamano
git-tag: Do
n
ot
a
ssume t
h
e
w
orking tree root is w
r
i
t
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Nick
Hengeveld
Remove the temp fil
e
if it is empty
a
fter
t
he request
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
Illust
r
ation: "C
o
mmit DAG
R
evision Na
m
ing"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustration: "Git
Diff Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hamano
Illustratio
n
: "
F
undamental Git Index Operat
i
ons"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
git-me
r
ge-ours: make sur
e
our
index mat
c
hes H
E
AD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ham
a
no
Add 'ours' merg
e
strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Ad
d
--no-commit
to git-merge/gi
t
-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hama
n
o
Document
--since and --until options to
rev-pars
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Be car
e
ful
when derefer
e
ncing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Peter Eriksen
[PATCH
]
Clean
up the SunOS Makefile rule
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
I
g
n
o
re '\r'
at the end of
l
i
n
e
in $GIT_
D
IR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Alex Riesen
remove CR/LF from
.
g
itignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ham
a
no
D
o
not fail
o
n h
i
erarchical branch names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next