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
ma
n
o
Me
r
ge 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
Junio C Ha
m
ano
git-merge:
f
ail c
o
rrectly wh
e
n we canno
t
fast forward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Start prepari
n
g Release Notes for
1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Documentat
i
on: git-remote 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-ap
p
ly: do not fix whitespaces on context
l
ine
s
.
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
Junio C Hamano
Documenta
t
ion: descri
b
e
"
-f/-t/-m" options to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Haman
o
di
f
f
-
-c
c
: f
i
x display
o
f symlink con
f
licts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
Merge branch 'jc/merge
-
symlink' int
o
maint
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o
C Hama
n
o
mer
g
e
-
r
e
cursive: fix
longsta
n
d
ing bug in mergin
g
syml
i
n
ks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
me
r
ge-index: fix longstand
i
ng
bu
g
in mer
g
ing s
y
m
lin
k
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Jun
i
o C Ha
m
ano
Ad
d
Release Not
e
s to prepare for
1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rerere: d
o
not deal
wit
h
s
y
ml
i
nks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rerere: do
n
ot skip two conflicted
p
aths next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Merg
e
git://
r
epo
.
o
r
.
cz/git-gui into maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don't
m
o
dif
y
CREDITS-
F
I
L
E
i
f
it
ha
s
n't chang
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
i
o C Hama
n
o
diff-p
a
tch: Avoid em
i
tting
d
oub
l
e-slas
h
es in t
e
xtual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Reword git-am 3-way fallback failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
H
amano
Merge b
r
anch
'
m
a
ster'
o
f
g
it://
r
epo
.
or
.
c
z/git-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
J
u
ni
o
C Hamano
GIT
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o C Ha
m
ano
Update d
r
a
f
t release note
s
for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C
Hamano
Merge
git://gi
t
.
k
ernel
.
or
g
/pub/s
c
m
/
gitk/gitk into maint
commit
|
commitdiff
|
tree
2007-02-17
Junio
C Hamano
Do not tak
e
m
o
de bits from index after type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
git-m
e
rge:
m
in
o
r fix for no_triv
i
al_merge_s
t
rat
e
gies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
J
unio C Haman
o
pret
e
nd-sha1: grave
b
u
g
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C
H
amano
GIT-VERS
I
ON-FILE: chec
k
.
/version f
i
rst
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PATCH] gitk: Us
e
sho
w
-ref inste
a
d of ls-r
e
mote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Ha
m
ano
[
P
ATCH]
Make gitk wor
k
reas
o
nably well o
n
Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
no
Make sure packedgitw
i
n
dowsize is m
u
ltiple
o
f (
p
a
g
e
size
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
no
Add Rel
N
ote
s
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ha
m
a
n
o
Stil
l
updating 1
.
5
.
0
r
elease notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
mano
Clari
f
y two b
a
ckward incompati
b
l
e
repos
i
to
r
y
options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Makefile: update check
-
d
ocs ta
r
get
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C Hamano
cm
d
-
li
s
t: add git-r
e
mot
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Ha
m
ano
Docume
n
tation: Drop ful
l
-stop from
g
it-fast-import
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
GIT 1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Ju
n
io C H
a
m
ano
Add release note
s
t
o
t
h
e distr
i
bution
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
unio C Ham
a
no
Me
r
ge b
r
anc
h
'm
a
ste
r
' of g
i
t://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio C H
a
mano
Documentation
:
Moving
o
ut of detached
HEAD does not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C
Haman
o
"git-fetch --tags $
U
RL" should no
t
overwrite
e
xisti
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C H
a
mano
for-
e
ach-ref
l
og: not h
a
ving
$
G
IT
_
DI
R
/logs directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C Hamano
Do not
forget
t
o pack objects reachable from HEAD reflog
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ham
a
no
Add RPM
t
a
rge
t
for git-gu
i
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C
Hamano
Merge b
r
a
n
ch 'master' of
g
i
t
://re
p
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-12
J
u
nio C H
a
mano
Merge git
-
gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Ju
n
io
C
Hama
n
o
Add dis
c
ussion se
c
ti
o
n
to git-ta
g
docum
e
n
tation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio
C Hamano
Teach git-am to
p
a
s
s -p opti
o
n d
o
wn to
git
-
ap
p
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Juni
o
C
Hama
n
o
Documentation: git
-
rebase -C<n>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
J
u
n
io C H
a
man
o
Merge branch 'mast
e
r
'
of git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-02-11
Junio C H
a
mano
t4
0
16: te
s
t
quoting funny pathnames
in
d
iff outp
u
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C
Hamano
diff_fl
u
sh_name(): take struc
t
di
f
f_o
p
tions
p
a
ram
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C Hamano
wt
_
status_prepare():
c
lean up struc
t
ure initialization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
git
-
f
e
t
ch: document automatic tag follo
w
i
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Juni
o
C Hamano
Document
a
tion/git-pull: describe defa
u
lt beh
a
viour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C H
a
m
ano
r
eflog: ha
n
d
l
e
$na
m
e
=> remot
e
s/%s/H
E
AD mapping consistently
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-08
J
u
nio
C
H
a
m
ano
Mer
g
e
b
ranch 'master' of git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-02-08
Junio C Hamano
creat
e
_symref
(
)
: creat
e
leading directories as needed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Ju
n
io C Hamano
GIT v1
.
5
.
0
-rc4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C Haman
o
Documentation: Add gfi t
o
t
he main command
l
i
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
unio C Hama
n
o
gi
t
-add -
i
: upda
t
e
removed path correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
t4
2
00: sk
i
p gc
-
rerere
t
est o
n
sy
s
te
m
s with
n
on GNU
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Merg
e
branch 'ml/gitk'
(
e
arly part)
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C Hamano
for-ea
c
h-reflog:
f
ix case fo
r
empty
log di
r
ectory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Merge branch 'master' of
git:
/
/repo
.
or
.
cz/git/
f
astimport
commit
|
commitdiff
|
tree
2007-02-07
J
unio C Hamano
g
it-clone --refer
e
nce:
w
or
k
well
w
ith pack-ref'ed ref
e
re
n
ce
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Ju
n
io C Hamano
R
e
move git-merge-recur
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
u
nio
C H
a
mano
Add deprecati
o
n notices
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o C Ham
a
no
M
e
r
g
e
branch 'master
'
of git://
r
epo
.
or
.
cz
/
git/fas
t
i
m
p
ort
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o
C Hama
n
o
Remove contrib/color
d
iff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Ha
m
ano
S_IFLNK != 014
0
000
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
annotate: fi
x
fo
r
cvsserver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io C Hamano
gitw
e
b: fix
mi
s
matched parenthesis
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Juni
o
C Ha
m
ano
git-push:
allow glo
b
bing wildcar
d
re
f
spec
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Haman
o
gitk: Use show-
r
ef instead
o
f ls-rem
o
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
Fix longstandin
g
m
ismerge of
A
LL_CFL
A
GS vs BA
S
IC
_
CFLAGS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio
C
Hamano
Teach git
-
remote add to fe
t
ch a
n
d track
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
bla
m
e:
docume
n
t
--
c
ont
e
nts o
p
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Haman
o
Us
e
pretend_sha1_file() in gi
t
-b
l
ame and git
-
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio C Hamano
A
dd pretend_sh
a
1_f
i
le() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio C Hama
n
o
git-blame:
no rev means start from the
worki
n
g t
r
ee
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Ju
n
io C H
a
mano
b
isect: it n
e
eds to b
e
done in a
wo
r
king tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
ni
o
C
H
aman
o
t9200: Work a
r
ound HFS+ issue
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
n
io C Hamano
Rename get_ident() to
fmt_
i
dent() and ma
k
e it
a
vailable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio C Hama
n
o
R
evert "Al
l
ow branch
.
*
.
merge to talk ab
o
ut remote
t
racking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Merge branch 'np/
d
reflog'
commit
|
commitdiff
|
tree
2007-02-04
Junio C Ha
m
ano
git-clone --refer
e
nce:
s
aner handling of borrowed symrefs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
unio C
Hamano
show
-
br
a
nch -g: default
to the c
u
rrent br
a
nch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C
Hamano
Merge branch 'm
a
ster'
i
n
to np/dreflo
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
u
nio C
H
a
m
ano
combine-diff: speci
a
l case
--u
n
ified=0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Juni
o
C Ha
m
ano
Wh
y
is it bad to rewind a branch that has a
l
ready been
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
h
o
n
or
GI
T
_REFLOG_ACT
I
ON in git-commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Jun
i
o C Hamano
fix reflog entri
e
s fo
r
"git-branch"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Juni
o
C Ha
m
ano
c
o
re-t
u
torial: htt
p
r
eference link fi
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Ha
m
ano
Tutorial-2: Adjust git-status o
u
tput
to
r
ecent re
a
l
i
ty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
J
uni
o
C Hama
n
o
Tu
t
orial: f
i
x asciido
c
formattin
g
o
f
"gi
t
add" section
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-02
Jun
i
o C Ha
m
ano
Use
"
g
it check
o
ut -q" in git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-01
Juni
o
C Hamano
de
t
ached
HEA
D
-- f
i
nishin
g
touches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Jun
i
o
C
Hamano
GIT v1
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio
C
Hamano
Do not use har
d
coded pa
t
h
to xhmtl
.
xsl to generat
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next