repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint
2007-03-06
Junio C
H
a
m
ano
Merg
e
b
ranch 'maint-for-junio' of git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
GIT
1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Junio C
H
am
a
no
git-merge: fail correctly
when we canno
t
fast
f
orward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
Start
prep
a
ring Release Notes f
o
r
1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Documentation: git-remote
ad
d
[
-
t
<bra
n
ch>] [-m <
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
J
un
i
o C Hamano
g
i
t-app
l
y: do n
o
t fix whites
p
aces o
n
c
ont
e
xt lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
uni
o
C
Ha
m
a
n
o
D
o
cumentat
i
o
n
: describe "-f
/
-t/-m" options to "gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
diff --c
c
:
f
ix display of
s
y
mlink
c
o
n
flicts
during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Hamano
Merg
e
br
a
nch
'jc/merge-
s
ym
l
ink' i
n
to maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
m
erg
e
-r
e
cursive
:
fix longstand
i
ng bug in merging s
y
mli
n
ks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Ha
m
ano
mer
g
e
-
index: fix longstan
d
ing bug in merging
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Ad
d
R
e
lea
s
e Notes to prepare for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Hamano
rerere: do
n
o
t deal
w
ith symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Hamano
rerere
:
d
o
n
ot
s
kip two conflicted p
a
t
h
s next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Mer
g
e git
:
//repo
.
or
.
cz/git-gui into maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don't mod
i
fy CRED
I
T
S-FILE if
i
t
ha
s
n't c
h
anged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C
Hamano
di
f
f-patch: Avoi
d
emitting double
-
slas
h
es in textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C Ha
m
an
o
Reword git-am 3
-
way fallbac
k
f
ailure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Haman
o
Mer
g
e
b
r
a
nch 'master' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
J
unio
C H
a
mano
GIT 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Up
d
ate draft release not
e
s for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
unio
C
Hamano
Merge git://git
.
kernel
.
org/pub/scm/gi
t
k/gitk
i
nto
maint
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Do not ta
k
e mode
bits
f
r
o
m
index after t
y
p
e
change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
git-m
e
rge:
m
inor
fix
for
no_trivia
l
_me
r
ge_strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hama
n
o
prete
n
d-sha1:
grave bugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
mano
G
IT-VERSION-F
I
LE: check
.
/ver
s
ion
first
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hama
n
o
[P
A
TCH] gi
t
k:
Use
s
how-ref ins
t
ead o
f
ls-
r
em
o
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Hama
n
o
[PATCH] M
a
ke gitk wo
r
k
reas
o
nabl
y
well on
Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Hamano
Make s
u
r
e
p
a
ckedgitwindowsi
z
e is mul
t
iple of (pages
i
ze
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
H
a
mano
A
d
d RelNotes 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
i
o
C Hamano
Still updatin
g
1
.
5
.
0
re
l
ease notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C Hama
n
o
Cl
a
rify two
b
ackward
i
ncompat
i
b
l
e repository op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
n
o
Makefile:
update check
-
docs target
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Hamano
cmd-
l
i
st:
add git-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C
Hamano
D
o
cumentation: Drop
f
ull-stop from git-
f
ast-i
m
port
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
mano
GIT 1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
J
u
nio C
H
aman
o
Add release
notes to the
distr
i
b
ution
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
u
nio C Hamano
M
erge branch '
m
aster' of git:
/
/repo
.
or
.
c
z/gi
t
-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio
C
Ham
a
n
o
Documentation: Movi
n
g
o
ut o
f
d
e
tached
HEAD does not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
a
mano
"git-
f
e
t
ch
-
-tags $URL" should not overwrite existing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio
C
Hamano
for-each-ref
l
o
g
: not hav
i
ng $G
I
T_DIR
/
l
o
gs d
i
r
ect
o
ry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Do not forget to
pack obj
e
c
ts reachable fro
m
H
E
AD re
f
lo
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Add RPM target for git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o
C Hamano
Mer
g
e
branch
'
master' of git:/
/
r
e
po
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Merg
e
git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
J
unio C Haman
o
Ad
d
discussion s
e
cti
o
n
to git-tag documenta
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Teach
g
it-am to pass -p option down to git
-
app
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
D
o
c
u
menta
t
ion: git-r
e
base -C<n>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Ha
m
a
n
o
Merge
b
ranch 'master' of git://re
p
o
.
or
.
cz/git/
f
astimp
o
rt
commit
|
commitdiff
|
tree
2007-02-11
Juni
o
C Hamano
t4016:
t
est
q
uotin
g
fu
n
ny pathnames in diff ou
t
put
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C
H
a
mano
dif
f
_flush_n
a
m
e(): take struct diff_o
p
tions pa
r
ameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
J
unio
C
H
amano
wt_statu
s
_prepare()
:
clea
n
up structure initializa
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Haman
o
git
-
fetc
h
: document
a
utoma
t
ic tag f
o
llow
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Juni
o
C Hamano
Docume
n
tation/git-pull: d
e
scribe d
e
fault behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C
Ham
a
no
reflog: hand
l
e $name =>
remotes/
%
s
/H
E
A
D mapp
i
n
g consi
s
t
e
n
tly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-08
J
unio C Hamano
Merge branch 'master' of git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-02-08
Junio
C
Hamano
create_symref(): create leading directories as needed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
unio C
H
am
a
no
G
IT v1
.
5
.
0-rc4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o C Hamano
Docu
m
entatio
n
: A
d
d
gfi to the main comm
a
n
d
list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
u
ni
o
C
Hamano
git-add -i: u
p
date removed path c
o
rrectl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
u
n
io C
Hamano
t4200: skip gc-rerere t
e
st
on systems w
i
th non GNU
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Merg
e
b
r
anch
'm
l
/
gitk'
(
e
arly part)
commit
|
commitdiff
|
tree
2007-02-07
Junio
C Hamano
for-each-reflog: fix case for empt
y
log directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hama
n
o
Merge bra
n
ch 'm
a
s
ter' of git://r
e
p
o
.
o
r
.
cz/git/
f
a
stimport
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o C Ha
m
ano
git-clone
--refe
r
e
n
ce: work well with pack-ref'ed reference
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
Remove git-merge-recur
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Hamano
Add deprecation
n
otices
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
M
e
rge br
a
nch 'maste
r
' o
f
g
it://repo
.
or
.
cz/git/f
a
st
i
mpo
r
t
commit
|
commitdiff
|
tree
2007-02-07
Junio C Ha
m
ano
Remove co
n
tr
i
b/colordiff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io
C
Hamano
S_IFLNK
!
=
0140000
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
annotate:
f
ix for
c
vss
e
rver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio
C Ha
m
ano
git
w
eb:
f
ix mismatche
d
pare
n
thesis
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
gi
t
-
p
ush: allow globbing
w
ildcard refsp
e
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hama
n
o
gitk: Use show-
r
ef
i
nst
e
ad
o
f ls-r
e
mote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io C Hamano
F
ix l
o
ng
s
tan
d
ing mismerge of ALL_C
F
LAGS vs BASIC_CFL
A
GS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
unio C H
a
mano
Te
a
ch
git-remote
a
dd t
o
f
etch and
track
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
unio C Hamano
blame: docum
e
nt --c
o
ntents
option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C Ha
m
an
o
Use prete
n
d_sha1_file() in git
-
blame and
g
i
t-merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Ha
m
ano
Add pr
e
tend_sha1_file() int
e
rfac
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C
H
a
mano
git-b
l
a
me: no
r
ev mean
s
start from t
h
e working tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C H
a
mano
b
i
sect: it needs to
b
e
done in a wor
k
ing tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
t
9
20
0
:
W
o
r
k
around HFS
+
issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Juni
o
C
Hamano
R
e
name get_iden
t
()
to fmt_ident() an
d
make it ava
i
lable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Revert
"
Allow branch
.
*
.
merge to talk about
remote tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Merg
e
bran
c
h 'np/dreflog'
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
git
-
clone --refer
e
nce: saner handling of borrowed symrefs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
show-
b
ranch
-
g: default to the current
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
Merge bran
c
h 'master'
i
nt
o
np/
d
refl
o
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Juni
o
C Haman
o
c
o
mbine-diff:
s
pecia
l
c
a
se --uni
f
ied=0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hama
n
o
W
hy
i
s it bad to r
e
w
i
n
d
a
branc
h
that has a
l
ready been
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
J
uni
o
C
Ha
m
ano
honor GIT_REFLOG_ACTION
in git
-
commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
fix r
e
flog entries
f
or "g
i
t-branch"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C
H
amano
core
-
tutor
i
al: ht
t
p
reference
l
ink fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
J
u
nio C
H
amano
T
utorial-2: Adju
s
t
g
i
t
-
status output to
r
e
cent realit
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
Tutorial: fix asciid
o
c form
a
tting of "git add
"
secti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-02
Junio C Hamano
Use "git checkout -q" i
n
git-
b
isect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-01
Junio C H
a
m
an
o
detached HEAD
-
-
finishin
g
touches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
J
unio
C
H
a
mano
GIT v1
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Juni
o
C Hamano
Do
not use ha
r
dcoded path to xhmtl
.
xsl to
generate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next