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
Ju
n
io C Hama
n
o
Merg
e
branch 'maint-for
-
junio' of git:
/
/repo
.
or
.
c
z
.
.
.
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
Ju
n
io C Ha
m
a
n
o
g
i
t
-merge:
fail
c
orrectly when
we cannot fast forward
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Sta
r
t
p
reparing
R
elease Notes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o
C
H
a
mano
Documentat
i
on: git-rem
o
te ad
d
[-t <branch>] [-m
<
branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
git-apply: do
not fix
wh
i
tespa
c
es on context l
i
nes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C
H
amano
GIT 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Do
c
umentation: describe "-f/
-
t/-
m
" o
p
ti
o
n
s to "git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hama
n
o
diff --cc: fix display
o
f
sy
m
li
n
k conflicts
d
ur
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C
H
ama
n
o
Merge branch 'jc/merge-symli
n
k' into
m
ai
n
t
commit
|
commitdiff
|
tree
2007-02-26
J
unio
C
Hamano
merg
e
-recur
s
ive: fix
longstanding
b
u
g
in
merging
symlin
k
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge-i
n
dex: fix long
s
tanding bug in
m
e
rging symli
n
ks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
u
n
io C
Hamano
A
dd Relea
s
e N
o
tes to pr
e
pare for 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
r
e
rere:
do not deal
with syml
i
nks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
a
mano
rerere: do not skip two
c
onflic
t
ed paths next
t
o
each
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
unio
C
Haman
o
Merge g
i
t:/
/
r
epo
.
or
.
cz/git-
g
u
i into
main
t
commit
|
commitdiff
|
tree
2007-02-25
J
u
n
io C Hamano
Don't modif
y
CR
E
DITS-F
I
LE
if it h
a
sn't c
h
anged
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
diff-patch:
A
void emitting double-slashes
i
n
te
x
tual
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
i
o C
H
aman
o
R
e
word g
i
t
-am 3-w
a
y fallback fa
i
lure mes
s
age
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hama
n
o
Merge bran
c
h 'm
a
ster
'
of
git
:
//repo
.
or
.
cz/git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
GI
T
1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Ham
a
no
Update dr
a
ft release n
o
tes for
1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Ham
a
no
Me
r
ge git://git
.
kernel
.
org/pub/scm/gitk/gitk into maint
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Do
not take mode bits from index after t
y
pe chan
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Juni
o
C
Haman
o
git-merge: minor fix for
no
_
trivial_me
r
g
e
_strat
e
gies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pretend-sha
1
: g
r
a
v
e bugfix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hama
n
o
GIT-VE
R
S
I
ON-F
I
LE: check
.
/
ve
r
s
ion first
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PATCH] gitk: Use sho
w
-ref instead
o
f
ls-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
[PA
T
CH] Make git
k
work reasonabl
y
well
on Cygwin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C
H
amano
Make sure p
a
ckedg
i
twind
o
wsize
i
s mult
i
ple o
f
(p
a
gesiz
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Add
R
el
N
otes 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
Still updat
i
ng 1
.
5
.
0 relea
s
e n
o
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Haman
o
Clarify t
w
o backward incompatible reposit
o
ry op
t
ions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
Makefile: update
c
heck-docs
t
arget
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
c
md-
l
is
t
:
add git-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C H
a
m
a
no
Documentation: Drop full-sto
p
from git-fa
s
t-import
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
io C Hamano
GIT
1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Junio
C Ham
a
no
Add
r
elease
no
t
es to the dist
r
i
b
ution
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hama
n
o
M
e
rg
e
b
ranch 'master' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio
C
Hamano
Documentation: Moving out of detached HEAD does not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
"gi
t
-
fetch --tag
s
$URL" should not overwrite ex
i
sting
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ham
a
n
o
for-
e
a
c
h-reflog:
n
ot hav
i
ng $GIT_DI
R
/lo
g
s
di
r
ectory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C Hamano
Do
n
ot forget to pack obj
e
cts re
a
chab
l
e from HEAD reflog
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Add RPM
t
arget for g
i
t-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
J
unio C Ha
m
ano
Me
r
ge
branch
'master' o
f
g
i
t
://
r
epo
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2007-02-12
Jun
i
o C Ham
a
no
Me
r
ge git-
g
u
i
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Ad
d
di
s
c
uss
i
o
n section to
g
i
t-tag documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
J
u
nio
C
H
aman
o
Teach git-
a
m
to pass -p optio
n
down to
g
it-
a
ppl
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Juni
o
C
H
am
a
n
o
Docum
e
ntation: 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
ano
Mer
g
e branch
'master' of git://repo
.
or
.
cz/git/fast
i
mport
commit
|
commitdiff
|
tree
2007-02-11
Junio C Hamano
t4016: test qu
o
tin
g
f
u
nny pathnames in diff output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-10
Junio C H
a
m
a
no
diff_fl
u
sh_n
a
me
(
): take struct diff_options pa
r
amete
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-10
Juni
o
C Hamano
wt_status_p
r
epare()
:
c
l
e
a
n up stru
c
ture initializati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
Juni
o
C Hamano
git-fetch:
do
c
ument auto
m
atic tag following
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
Documenta
t
ion/g
i
t-pu
l
l
: describe
default behav
i
our
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
Ju
n
i
o
C
H
a
m
ano
reflog: handle $na
m
e => rem
o
tes/%s/HEAD m
a
pping con
s
i
s
tently
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-08
Juni
o
C
H
am
a
no
M
er
g
e
b
ranch 'master' of git:
/
/repo
.
or
.
cz/git/
f
astimpo
r
t
commit
|
commitdiff
|
tree
2007-02-08
Juni
o
C
Ha
m
ano
crea
t
e_symref(): cr
e
ate l
e
ading
direc
t
ories as n
e
eded
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
H
amano
GIT v1
.
5
.
0-rc4
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o C Hamano
Documentati
o
n
:
Ad
d
gfi to t
h
e
main co
m
m
a
nd lis
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hama
n
o
git-a
d
d -i
:
update remo
v
ed
path
c
orrectly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Ju
n
io C Hamano
t
4
200
:
s
k
ip gc
-
re
r
ere t
e
st on
systems with non
GNU
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o C
H
amano
Merge
b
ranch 'ml/gitk' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-02-07
Junio C Ha
m
a
n
o
fo
r
-each-reflog: f
i
x case for e
m
pty log dire
c
tory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
J
unio C Ha
m
ano
Merge branch 'master'
o
f
g
it:/
/
repo
.
or
.
cz/git/
f
ast
i
m
p
ort
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
git-c
l
on
e
--reference
:
work
w
e
ll with
p
a
c
k-
r
ef'ed reference
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hama
n
o
Remove git-m
e
rge-recur
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C Ha
m
ano
A
d
d dep
r
ecation
notic
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Ju
n
io C Haman
o
Merge bra
n
c
h
'master' o
f
git://repo
.
or
.
c
z/git/fas
t
import
commit
|
commitdiff
|
tree
2007-02-07
J
unio
C
H
a
mano
Rem
o
ve contri
b
/colordiff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C
H
a
mano
S_IFLNK != 0140000
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io C
H
a
mano
an
n
ot
a
te: fi
x
for cvsserver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Ham
a
n
o
gitweb
:
fix mismatched pare
n
thesis
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
J
u
nio C H
a
mano
g
i
t
-
push: allow
g
l
obbing
wildcar
d
refspe
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
J
u
nio C Hamano
g
itk: Use
s
h
ow-r
e
f instead o
f
ls-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io C Hama
n
o
Fix longs
t
a
n
ding mism
e
rge
o
f
ALL_CFLAGS
v
s BASIC_CFLAGS
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio C Hamano
Teac
h
git
-
re
m
ote a
d
d to
f
e
t
ch an
d
track
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hama
n
o
bla
m
e: document --contents option
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Use pre
t
e
nd_s
h
a1_file() in git-blame and git-mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Add pretend_
s
h
a
1_file() inter
f
ace
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio C Hamano
g
i
t-bla
m
e: no rev means start
f
rom the workin
g
tre
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
bisec
t
:
i
t needs to be done in a working t
r
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Ju
n
i
o C Hama
n
o
t9200: Wo
r
k around HFS+
issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Rename get_ident(
)
to fmt_i
d
ent()
and make
it avail
a
ble
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Haman
o
Re
v
er
t
"
Allow branch
.
*
.
merge
t
o talk about
r
e
m
ote
t
racking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Ha
m
ano
Mer
g
e branch 'np
/
dref
l
og'
commit
|
commitdiff
|
tree
2007-02-04
J
u
n
i
o
C Hamano
gi
t
-
clone --r
e
f
e
r
enc
e
: saner handling of borrowed s
y
mrefs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Junio
C Hamano
sh
o
w-br
a
nch
-g: default to the current br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Juni
o
C Hamano
Merge branch 'ma
s
ter' into np/dreflog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Ha
m
ano
com
b
ine-diff: special case
-
-unified=0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Juni
o
C Hamano
W
h
y
is it bad to re
w
ind a branch
t
hat has
already been
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
J
u
nio C Hamano
h
o
n
or GIT_R
E
F
L
OG_ACTION
i
n git-comm
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
J
unio C Hamano
fix reflog entries
f
or "git-b
r
anc
h
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
J
u
n
io C Haman
o
c
ore-
t
utorial: ht
t
p
reference link fix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
J
u
nio C Hamano
Tutorial-2: Adjust git-sta
t
us output to rece
n
t reality
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
Tut
o
ri
a
l
: fix
asciidoc for
m
att
i
ng of "git add" sect
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-02
Jun
i
o C H
a
mano
Use "gi
t
checkout -q" in git-
b
is
e
ct
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-01
Junio
C
Hama
n
o
detached HEAD -- f
i
nishing to
u
ches
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Junio C
H
a
mano
GIT v1
.
5
.
0
-rc3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Ju
n
i
o
C
Hamano
Do not use hardcoded path to xhmtl
.
xsl to gene
r
at
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next