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
Hamano
d
i
ff --c
c
: fix display of symlink conflicts d
u
ring
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
M
erge b
r
anc
h
'jc/merge-sy
m
lin
k
'
int
o
maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
m
e
rge-re
c
ursive: fix longstanding bug in m
e
rging sy
m
links
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
n
io
C
H
a
mano
merge-index
:
fix longstand
i
ng bug in merging
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Add Re
l
e
a
se Notes t
o
pre
p
a
re for
1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Haman
o
rerere:
do not deal wit
h
syml
i
nks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
rerere: do not
skip two conflicted paths n
e
xt to eac
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
a
mano
Mer
g
e git://re
p
o
.
or
.
cz/git-gu
i
into
maint
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Don't mod
i
fy CREDITS-FILE if
i
t
h
asn't chan
g
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
d
i
ff-patch: Avoid em
i
t
ti
n
g dou
b
le-slashes in
tex
t
ual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hama
n
o
Reword
g
it-am 3
-
w
a
y fa
l
lback failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
e
rge bran
c
h
'
ma
s
ter' of git://r
e
po
.
or
.
cz/
g
it-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
Jun
i
o C H
a
mano
G
IT 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
io C
Ha
m
ano
Update draft re
l
ease n
o
tes for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
unio C
H
a
mano
Mer
g
e g
i
t://g
i
t
.
kernel
.
org/
p
ub/scm/gitk/gitk into maint
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
Hamano
Do
not ta
k
e mode bits from ind
e
x
after typ
e
c
h
a
n
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
J
unio C H
a
mano
git-merge: m
i
nor fix f
o
r no_
t
riv
i
a
l_m
e
rge_stra
t
egies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
J
u
nio C Hamano
pretend-sh
a
1
: gr
a
ve bugf
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
G
I
T-V
E
RS
I
ON-FILE: c
h
e
c
k
.
/v
e
rs
i
on f
i
rst
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Hamano
[PAT
C
H] gi
t
k
:
Use sho
w
-ref instead of ls-remo
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
[PATCH] Make
g
itk work r
e
a
son
a
bl
y
well on Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
io C Hama
n
o
M
a
k
e
sur
e
pack
e
dgitwindo
w
s
i
ze is mu
l
tiple of (pagesi
z
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C Hamano
Add RelNotes 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Haman
o
Still upda
t
ing 1
.
5
.
0 release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Cla
r
ify
two backward in
c
o
mpatible repository option
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Hamano
Makefile: update check-docs 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 Hamano
Documentation:
D
ro
p
f
u
l
l-stop
f
rom git-fast-im
p
ort
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
n
o
GI
T
1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ha
m
ano
Add release note
s
to
t
he
distr
i
bution
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
Hama
n
o
Merge branch
'
maste
r
' of git://
r
epo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio
C H
a
ma
n
o
Do
c
u
me
n
tat
i
on: Moving out of detached HEAD does not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Hamano
"git-fetch --tags $URL" shou
l
d not o
v
er
w
rite existing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
am
a
no
f
o
r-each-reflog: not
h
a
ving $GIT_DIR/logs direc
t
ory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ham
a
no
D
o not forget to pack objects
reachabl
e
f
ro
m
HEAD r
e
f
log
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C Hamano
Add RPM target for git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
Hamano
M
erg
e
branch '
m
ast
e
r' of git:
/
/rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-12
Jun
i
o C
Hamano
Mer
g
e
g
it-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Ju
n
io C Ha
m
ano
Add d
i
scussion
s
ectio
n
t
o
git-tag documentat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Teach g
i
t
-
am to pass -p op
t
i
on down
to git
-
apply
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Haman
o
Documen
t
ation: git
-
rebase -C<n>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio
C
Hamano
Merge b
r
anch 'master' of g
i
t:/
/
r
e
p
o
.
or
.
c
z
/
g
it/fastimport
commit
|
commitdiff
|
tree
2007-02-11
J
unio C Hamano
t4016: tes
t
quoting
f
u
nny pathnames in diff out
p
ut
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Jun
i
o C Ham
a
n
o
diff_f
l
ush_name():
t
ake struct diff
_
options parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C H
a
m
a
no
wt_status_prep
a
re(
)
:
clean up structure ini
t
ializat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Jun
i
o C H
a
mano
git-fetch: d
o
cument automatic tag following
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
Documentation/git-pull: describe def
a
ul
t
beh
a
viour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
re
f
log: handle $na
m
e
=> remotes/%s/HEAD mapping consis
t
ently
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-08
J
u
ni
o
C Hamano
Merg
e
b
ran
c
h '
m
aster' of git://rep
o
.
or
.
cz/gi
t
/fastimport
commit
|
commitdiff
|
tree
2007-02-08
Ju
n
io C Hamano
create_
s
ymref(): create leading dire
c
t
ories a
s
neede
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Ha
m
ano
GIT v
1
.
5
.
0-rc4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C H
a
m
a
no
Documentation: Add g
f
i
t
o the ma
i
n c
o
m
mand
l
ist
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
H
a
m
a
no
git-add -i: update removed path correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
J
u
nio C Hamano
t420
0
: skip g
c
-re
r
ere test on systems
w
ith non GNU
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Ham
a
n
o
Merg
e
branch 'ml/gitk' (early part)
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Hamano
for-each-reflog: fix case
f
or emp
t
y log directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o C Hamano
Merge
b
ranch 'master' of git:
/
/repo
.
or
.
c
z/git
/
fastimpo
r
t
commit
|
commitdiff
|
tree
2007-02-07
Junio
C Hama
n
o
git-clo
n
e --ref
e
r
ence
:
work
w
ell with pac
k
-re
f
'ed reference
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Remove git-merge
-
recu
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
H
amano
Add
d
eprecat
i
on
n
o
t
ices
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o
C H
a
mano
Merge
br
a
n
c
h 'master' of git:
/
/re
p
o
.
or
.
c
z
/git/f
a
stimport
commit
|
commitdiff
|
tree
2007-02-07
Junio
C Hamano
Re
m
o
v
e contrib/col
o
rdiff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
J
un
i
o C Haman
o
S_IFLNK != 0140000
commit
|
commitdiff
|
tree
2007-02-06
Jun
i
o
C
Hamano
a
n
n
otate: fix fo
r
cv
s
server
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Haman
o
gitweb
:
fi
x
mismatched p
a
renthesis
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Ju
n
io
C
H
amano
git-push:
a
llow g
l
obbing wi
l
dcard ref
s
p
e
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
gitk: U
s
e
s
how-ref instead of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C H
a
mano
F
i
x longstanding
m
i
s
merg
e
o
f
ALL_CFLAGS
vs B
A
SIC_CFLAGS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
amano
Teach git-r
e
mote add to fetch and
track
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Ju
n
io
C
Hamano
b
lame: document --co
n
tent
s
option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C H
a
mano
Use
p
retend_
s
ha1_fi
l
e(
)
i
n
g
it-blame and git-merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C H
a
mano
Add pretend_sha1_fil
e
() inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Jun
i
o
C
H
a
mano
git-
b
l
a
me: no rev mea
n
s start f
r
om th
e
w
orking tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
bisect:
i
t needs to be
d
one in a
w
or
k
i
n
g tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
t
9
20
0
: Work
a
round H
F
S+ issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Rename
get_i
d
en
t
() t
o
fmt_
i
dent() and make it availa
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C
Hamano
Revert "A
l
low branch
.
*
.
mer
g
e t
o
talk about
remote tra
c
king
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Ham
a
no
Merge branch 'np/dre
f
log'
commit
|
commitdiff
|
tree
2007-02-04
Junio
C
Hamano
g
it-c
l
one --re
f
erence:
sa
n
e
r
h
a
ndlin
g
of
borrowed symrefs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Juni
o
C
H
amano
show-branch
-g:
d
efault to the current b
r
an
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
Merge branch 'master'
i
n
t
o
n
p
/dr
e
flog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Haman
o
combine-di
f
f:
s
pe
c
ial case --un
i
fied=0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Juni
o
C Ham
a
n
o
Why is
i
t bad
t
o rewind a bran
c
h tha
t
h
a
s a
l
ready been
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
J
uni
o
C Hamano
ho
n
or GIT
_
RE
F
LOG_ACTION in git-comm
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Ju
n
io C Hamano
fi
x
r
eflog entries for "git-branch"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C H
a
mano
core-tut
o
rial
:
http reference
li
n
k fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
J
u
nio
C Ham
a
no
Tuto
r
ial-2: A
d
ju
s
t git-sta
t
us outpu
t
t
o recent
realit
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Haman
o
Tutor
i
al: fix asc
i
idoc forma
t
ti
n
g of "git add" sec
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-02
Junio C Hama
n
o
Use "git che
c
kout -q" in
git-
b
i
s
ect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-01
Junio C Haman
o
detached HEAD -- fi
n
ishing
touch
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio
C Hama
n
o
GIT
v1
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hama
n
o
Do not use hardcod
e
d
p
a
t
h
to xhmtl
.
xsl to
ge
n
e
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
J
un
i
o C
Hamano
git main documentation:
p
oint
at the user's manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Jun
i
o C H
a
mano
Mer
g
e b
r
a
n
ch 'maste
r
'
of git://linux-nfs
.
org/~bfi
e
lds/git
commit
|
commitdiff
|
tree
2007-01-31
J
u
nio C Haman
o
t9
2
00: do not test -x bit if
t
he filesystem does n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Ju
n
io C Ham
a
no
t9200: Re-
c
ode non-asci
i
p
a
th t
e
st
i
n UTF-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
D
o
cumentation:
"git-checkout <tree
>
<path>"
t
akes any
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
Fix
gi
t
-
ta
g
-u
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-30
Jun
i
o C
Hamano
git-send
-
email: remove debugging output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-01-30
J
u
nio C Hama
n
o
g
it-blame
:
somewhat better comm
e
nting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next