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
diff --cc: fix display of symlink conflicts during a merge.
2007-02-26
Juni
o
C Hama
n
o
diff --cc: f
i
x disp
l
ay of syml
i
n
k conflicts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch 'jc/merge
-
sy
m
link' into
maint
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Ha
m
ano
me
r
ge
-
r
ecursive: fix longstanding bug in m
e
rging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
amano
merge-
i
ndex: fi
x
l
o
ngstandi
n
g
b
ug in m
e
rging sy
m
links
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io C Hamano
Add Release Notes to pre
p
are
f
or 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ham
a
no
r
e
rer
e
:
d
o not
deal with sym
l
inks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Haman
o
rerere: do no
t
skip t
w
o conflicted
p
at
h
s next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Hamano
Merge
g
it://repo
.
or
.
cz/git-gui into
maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don
'
t
modify
C
R
E
DITS-FILE if
it
h
a
sn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
i
o C
H
a
mano
diff-p
a
tch: A
v
o
id emi
t
ting d
o
uble-slas
h
es in textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hamano
Re
w
or
d
git-a
m
3
-w
a
y f
a
llback fail
u
r
e
m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Ha
m
ano
Merge branch 'maste
r
' of git
:
//
r
epo
.
or
.
c
z/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
G
IT
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Update dr
a
ft rele
a
se notes for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
u
nio C Hamano
Merge git://git
.
kernel
.
org/pub/scm/gitk/gitk into mai
n
t
commit
|
commitdiff
|
tree
2007-02-17
Jun
i
o C Hamano
Do not take mode bits fro
m
index aft
e
r type c
h
ange
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C
Haman
o
git
-
merge:
minor fix
for no_trivial_
m
erge_
s
trateg
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pretend-sha
1
: grave
b
ugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
GIT-VERSION-FILE: chec
k
.
/version
first
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PATC
H
]
git
k
: Us
e
s
h
ow-ref instead
o
f
ls-remot
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Ham
a
no
[PA
T
C
H
] Make
g
itk work
r
easonably
w
ell o
n
Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
Ma
k
e sure packe
d
g
it
w
indowsiz
e
is
m
ultiple of
(pagesi
z
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
H
ama
n
o
A
dd Rel
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 updatin
g
1
.
5
.
0
release
notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
C
l
ari
f
y two backwa
r
d
i
n
c
o
mpati
b
le reposit
o
r
y
op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hama
n
o
Makefile: updat
e
check-do
c
s target
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
cmd
-
list: add git-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
amano
Do
c
umen
t
ation: Drop f
u
ll
-
s
t
o
p f
r
om
g
it-fast-impor
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
un
i
o C Hamano
GIT 1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
A
d
d
r
elease
notes to th
e
distr
i
bution
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
amano
Me
r
ge b
r
a
nch 'master' of git
:
//repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Doc
u
mentation:
Moving out
o
f detached HEAD does not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C H
a
mano
"
g
i
t-fetch --tag
s
$
URL" should not over
w
rite exi
s
ting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Hamano
for-each-reflog: not havi
n
g $GIT_D
I
R/logs director
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Ha
m
ano
Do not forget to pack objects r
e
acha
b
le from HE
A
D
reflog
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio
C
H
a
mano
Add RPM target fo
r
gi
t
-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Ju
n
i
o
C Haman
o
Merge bran
c
h 'master
'
of git://
r
epo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-02-12
Junio
C
Hamano
M
erge git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Jun
i
o C Hamano
Add discussio
n
sec
t
io
n
t
o gi
t
-
tag do
c
umen
t
at
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Teach git
-
am to p
a
ss -p
opti
o
n
down to git-apply
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Ju
n
io C Hamano
Documentatio
n
: git-rebas
e
-C<n>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hama
n
o
Merge
branch 'maste
r
' o
f
g
it://repo
.
or
.
cz
/
g
it/fastimpor
t
commit
|
commitdiff
|
tree
2007-02-11
J
u
n
io C Hamano
t401
6
: test quoting funny pa
t
hnames i
n
diff output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio
C
Hamano
diff_f
l
u
s
h_name
(
): ta
k
e
struct
d
i
f
f_options pa
r
ameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Juni
o
C Hamano
wt_status_
p
repare(): cl
e
an up structure i
n
iti
a
lization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C H
a
mano
git-
f
e
tch: document automati
c
tag following
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
J
unio C Ha
m
ano
Doc
u
mentation/gi
t
-pull: describe d
e
fault
beha
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
J
u
nio C Hamano
r
e
flog: han
d
le $n
a
m
e
=
>
remot
e
s/%s/HEAD map
p
ing con
s
i
s
te
n
tly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-08
Junio C
Hama
n
o
Merge branch
'mast
e
r
'
of gi
t
://repo
.
or
.
c
z
/git
/
f
a
stimport
commit
|
commitdiff
|
tree
2007-02-08
Junio C Hamano
cre
a
te_sy
m
ref(): create lea
d
ing d
i
r
e
c
tories as
neede
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
G
IT v1
.
5
.
0-r
c
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Documentat
i
o
n
:
Add
g
fi t
o
the main
command
l
ist
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
git
-
a
dd -i
:
upd
a
te
removed path correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
t
42
0
0: skip
gc-rerere test on systems with non GN
U
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C H
a
mano
Merge branch 'ml/gitk' (early par
t
)
commit
|
commitdiff
|
tree
2007-02-07
Junio C H
a
m
a
no
f
o
r-eac
h
-r
e
flog: fix case for empty log directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Haman
o
Mer
g
e branch
'
m
aster' of
git://repo
.
or
.
cz
/
git/
f
astimport
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
g
it-c
l
one --ref
e
r
e
nce: work well wi
t
h pa
c
k-r
e
f'ed r
e
ference
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hama
n
o
Remove git-merge-recu
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Ju
n
io C Hamano
Add de
p
recation notic
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Merge bran
c
h 'mas
t
er' of g
i
t
://
r
epo
.
or
.
cz/git/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Hamano
Remove con
t
rib
/
colordiff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C
H
a
mano
S_IFLNK !
=
0
1
400
0
0
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io
C
Hamano
annotate: fix for cvs
s
erver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io C
H
amano
gitweb:
f
ix
m
isma
t
ched p
a
rent
h
esis
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
git-pus
h
: allow
g
lobbing wildca
r
d
ref
s
pec
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
gitk:
U
se sh
o
w-
r
e
f instead
o
f ls-r
e
mote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
i
o C
Hamano
F
ix longstanding m
i
smerge of A
L
L_
C
F
LAGS vs B
A
S
I
C
_
CF
L
AGS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
uni
o
C H
a
mano
T
e
ach git-rem
o
t
e
add
to
f
e
tch and trac
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio C H
a
mano
blame:
document --contents option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
uni
o
C Ha
m
ano
Use pretend_s
h
a1_file() in git-blame a
n
d git-merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
A
dd p
r
etend_sh
a
1
_
fi
l
e() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
git-blame
:
n
o
rev
m
eans start
f
rom
t
he working tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Ju
n
io
C
H
amano
b
i
sec
t
: it n
e
eds to be done in
a
w
orking tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C
Hamano
t9200:
W
ork aroun
d
HFS+
i
s
sues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Juni
o
C Ham
a
no
Renam
e
get
_
ident()
t
o
f
m
t_
i
dent() and
make
it
a
vailable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
a
mano
Re
v
ert "Allow bran
c
h
.
*
.
merge to talk about remot
e
tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Mer
g
e branch
'
np/dreflo
g
'
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
g
i
t-cl
o
n
e
-
-
ref
e
rence: saner handling of
b
or
r
owed symrefs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
u
nio C Haman
o
sh
o
w-branch -g: d
e
fa
u
lt to t
h
e curren
t
branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
u
nio C Hamano
Merge
b
ranch
'master'
into np/dr
e
flog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
u
n
i
o C
H
amano
com
b
ine-d
i
ff:
s
p
ecial
c
ase --unified=0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Ha
m
an
o
Why is it bad to rewind a br
a
nch
that has
a
lready be
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
honor G
I
T
_
REFLOG_ACTION
i
n
git-commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio
C
Hamano
f
i
x
r
eflog entries for "git-bra
n
ch"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
core-tutorial: ht
t
p referen
c
e link
fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Jun
i
o C H
a
mano
Tutor
i
al-
2
:
Adju
s
t g
i
t-
s
tatus output
t
o recent rea
l
ity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C
Ham
a
n
o
Tut
o
ri
a
l: fix asciid
o
c formatting of "git add" se
c
ti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-02
Junio
C
H
aman
o
Use "gi
t
checkout -
q
" in
g
it-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-01
Junio
C
H
a
mano
detached HEAD -- finishing tou
c
hes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Haman
o
GIT v
1
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
Do not u
s
e hardcode
d
path to xhmtl
.
xs
l
to
g
e
n
erate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
J
unio C H
a
mano
g
it main documentati
o
n: point
a
t the user's manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
Merge br
a
nch 'maste
r
' of git://linux-
n
fs
.
o
r
g/~bfi
e
lds/git
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
t920
0
: do not test -
x
bit if the filesystem does not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Ju
n
io
C
Hama
n
o
t9200: Re-code non-asc
i
i
path test in UTF-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
Documentatio
n
: "git-checkout <
t
ree> <pat
h
>" takes
a
n
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
Fix git-
t
ag -u
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-30
J
u
nio C Hamano
g
i
t
-send-e
m
a
il: remo
v
e
de
b
ugging output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-30
Junio
C
Hamano
git-bla
m
e: somewhat
b
etter commenting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next