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
Junio C H
a
mano
diff -
-
c
c
: fix
display
o
f sym
l
i
n
k co
n
flicts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch 'jc/merge-symlink' into maint
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Haman
o
merge-recursive: fix longstanding bug in merging symlink
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
mer
g
e-
i
n
d
e
x: fix longstanding bug
in merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Add Rele
a
se
N
o
t
es to pre
p
are for
1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rerere: do
n
ot
d
eal w
i
th symlink
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio
C
Hamano
rerere:
d
o
not skip two conflicted paths ne
x
t to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C H
a
mano
Merg
e
git://repo
.
or
.
cz/git
-
gui
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
amano
Do
n
't modify CR
E
D
ITS-FILE if it hasn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
ni
o
C Ham
a
no
diff-patch: Avoid emitting
double-slashe
s
i
n
textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Reword
gi
t
-am 3-way fallback
failure
m
e
ss
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
ni
o
C
Haman
o
Merge branch 'master
'
o
f git://repo
.
or
.
cz/git-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
Jun
i
o C Hama
n
o
GIT 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Hamano
Updat
e
draft releas
e
n
otes for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Ha
m
ano
Merge git:
/
/git
.
kernel
.
org/
p
ub/scm/
g
itk
/
gitk into maint
commit
|
commitdiff
|
tree
2007-02-17
Ju
n
io
C
Ha
m
ano
D
o
not take mode bits from in
d
ex after type
change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Juni
o
C Hama
n
o
gi
t
-merge
:
min
o
r
fix for no_tr
i
vial_
m
erge_strate
g
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Ju
n
io
C Hamano
pretend-sha1:
g
r
av
e
bu
g
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C Hamano
GIT-VERSION-
F
I
L
E: check
.
/
ver
s
ion
f
irst
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hama
n
o
[
P
ATCH] g
i
t
k
:
Us
e
s
how
-
ref in
s
tead
o
f ls-r
e
mote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
[PATCH] Make g
i
tk wo
r
k reason
a
b
l
y w
e
ll on
Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
io
C Hamano
Make sure packedgitw
i
ndowsize
is multi
p
l
e of (pag
e
s
i
ze
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Add Rel
N
o
t
es
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
St
i
ll updating 1
.
5
.
0 release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Clari
f
y
t
wo backwar
d
incompatible repository options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
Makefile: update
c
heck
-
d
o
cs target
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
cm
d
-list: add git-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Hamano
Documentat
i
on: D
r
o
p
full-stop from gi
t
-
fa
s
t-import
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
GIT 1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
amano
A
d
d rele
a
se notes to t
h
e distributi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ha
m
ano
Mer
g
e branch
'm
a
ster' of git://repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C Hamano
Docume
n
tat
i
on:
Moving
o
u
t of detach
e
d
HEAD
d
o
e
s not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio
C
Hamano
"git
-
fetch --t
a
gs
$URL" should
n
o
t overwri
t
e existing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
u
ni
o
C
Hamano
f
or-each
-
ref
l
og: not having $GIT_DIR/logs directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
D
o n
o
t
forget to pack objects re
a
chable from
H
EAD
reflog
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Ju
n
io
C Hama
n
o
Add RP
M
target for
git-gu
i
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
M
e
rge branch 'mast
e
r'
o
f
gi
t
://
r
epo
.
o
r
.
cz
/
git
-
g
u
i
commit
|
commitdiff
|
tree
2007-02-12
Junio C Haman
o
M
e
rge git
-
gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Haman
o
Add
d
iscussion
s
ection to gi
t
-
ta
g
documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
J
u
nio C Hama
n
o
Teach git-am to pass
-
p
o
ption down to git-apply
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
J
unio C Hamano
Docum
e
ntatio
n
: git-rebase -C<n
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Jun
i
o C Hamano
Mer
g
e bra
n
ch 'master
'
o
f
g
i
t
://repo
.
or
.
c
z
/gi
t
/fastimport
commit
|
commitdiff
|
tree
2007-02-11
Junio
C
H
am
a
n
o
t4016: test quoting funny
p
a
t
hnames in diff ou
t
put
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C H
a
m
ano
diff_flush_name(): take struct diff
_
o
ptions
pa
r
ameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C Hamano
wt_status_prepare(): clean up structu
r
e initial
i
z
a
ti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
gi
t
-
f
etch:
d
ocument automatic tag following
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Jun
i
o C
H
amano
Documentation/gi
t
-pull: describe default behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Ham
a
no
reflo
g
: handle $name => remotes/%s/HEA
D
mapping
c
o
nsist
e
n
t
ly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-08
J
u
nio C Hamano
Mer
g
e b
r
an
c
h 'm
a
ster' of git://r
e
po
.
o
r
.
cz/git/fasti
m
port
commit
|
commitdiff
|
tree
2007-02-08
Junio C
H
a
mano
c
r
eate_symref(): create leading direc
t
ories as needed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
H
a
m
a
n
o
GIT v
1
.
5
.
0-rc4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
Doc
u
mentation:
A
dd gfi to
t
h
e ma
i
n command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
unio
C
Hamano
g
i
t-add
-
i: update
r
e
moved path correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
u
ni
o
C
H
amano
t4200: skip gc-
r
e
rere test on systems with non GNU
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Ha
m
ano
Merge branch 'ml/
g
itk' (early part)
commit
|
commitdiff
|
tree
2007-02-07
Junio C
H
amano
fo
r
-each-ref
l
o
g:
fix case for empty log di
r
ectory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
u
nio C
Ham
a
no
M
erge
branch
'
ma
s
ter' of
git:/
/
r
epo
.
or
.
c
z/git/fast
i
mp
o
rt
commit
|
commitdiff
|
tree
2007-02-07
Junio
C Hamano
gi
t
-clone --ref
e
rence: work well with pack-ref'ed
reference
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Haman
o
Remove git-merge-recur
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
uni
o
C
H
a
m
ano
Add
deprecation notices
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
H
a
mano
Merge branch 'master
'
o
f
git://r
e
po
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-02-07
Junio C
H
ama
n
o
Remove contrib/colo
r
di
f
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio
C
Ham
a
no
S
_
I
FLNK != 01400
0
0
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io C
H
amano
annot
a
t
e:
f
ix for cv
s
server
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
gitweb: fix mismatc
h
e
d parent
h
esis
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hama
n
o
git
-
pu
s
h
: al
l
ow globbing wildc
a
rd refspec
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Jun
i
o C H
a
mano
gitk: Use
sh
o
w-ref instead of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io C
Haman
o
Fix longs
t
anding mismerge of ALL
_
CFLAGS vs BASIC_CFLAGS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Jun
i
o C Hamano
Te
a
ch g
i
t-remot
e
add to fetch and track
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
amano
b
l
ame:
document --
c
o
n
tents option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C
Hamano
Us
e
p
retend_
s
ha1_file() in g
i
t-blame
and
g
i
t-merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
unio
C H
a
mano
Add pretend
_
sha1_file() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
unio C Ham
a
no
g
it-b
l
a
me: no rev means start fro
m
the working tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C Haman
o
b
isect:
i
t needs to be done in
a working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
Ha
m
ano
t9200
:
Work ar
o
und
H
FS+ issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Ha
m
ano
Rename get
_
ident
(
) to f
m
t_ident() and make it av
a
ilable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Ha
m
an
o
Re
v
ert "All
o
w b
r
anch
.
*
.
merge t
o
talk about r
e
m
ote trac
k
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Juni
o
C
Hamano
M
erge
b
ranc
h
'np/dreflog'
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
git-c
l
one --r
e
fer
e
nce:
saner handling of
b
orrowed symrefs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Ju
n
io C Hamano
show-branch -g:
default to the current branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
unio
C
Hamano
Merge br
a
nch 'mast
e
r'
into
np/drefl
o
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
combin
e
-diff: sp
e
cial case --unifie
d
=
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Jun
i
o C Hamano
Why is it bad to
r
ewind a branch tha
t
has already been
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Ju
n
io C H
a
mano
hon
o
r G
I
T_REFLO
G
_ACTION i
n
g
it-commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
fix re
f
log
e
ntries for "g
i
t-b
r
anch"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Ju
n
io
C
H
a
ma
n
o
core-tutor
i
al:
h
ttp r
e
fere
n
c
e
l
i
nk fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
Tutorial-2: Adjus
t
git-stat
u
s output
to rece
n
t real
i
ty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Jun
i
o
C
Hama
n
o
Tutorial: fi
x
asc
i
idoc forma
t
ting of "git
a
d
d
" s
e
ction
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-02
J
u
nio C Hamano
U
se
"git
c
heckout -q
"
in
git-
b
ise
c
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-01
Juni
o
C
H
a
mano
d
etached HEA
D
-- finishing touches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
GIT v1
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Ha
m
ano
Do
n
o
t
use ha
r
dcoded
p
a
th
t
o
x
h
mtl
.
xsl
t
o generat
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio
C Hamano
git main documentation:
p
o
i
nt a
t
the user's manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
J
u
nio C
H
amano
Mer
g
e br
a
n
c
h
'
master'
of git://linux-
n
fs
.
org/~bfields/git
commit
|
commitdiff
|
tree
2007-01-31
Jun
i
o C Hamano
t9200
:
do not
t
est
-x
b
it
if
th
e
fi
l
esystem doe
s
not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Jun
i
o C Hamano
t9200: Re-code non-ascii
path test in UTF-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
J
u
nio C Ham
a
no
D
ocu
m
entation: "g
i
t-checkout <tree>
<
path>
"
takes a
n
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Ju
n
io C
H
amano
Fix git
-
tag
-
u
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-30
Junio C Ham
a
n
o
git-send-email: remove debuggin
g
ou
t
put
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-30
Junio C Haman
o
gi
t
-blame: s
o
mewhat better commenting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next