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
J
unio C Ham
a
no
d
i
ff --cc:
f
ix display of s
y
mlink conflicts du
r
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
Merge branch 'jc/merge-symlink' into maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
amano
merge-recur
s
ive: fi
x
long
s
tand
i
ng
b
u
g
i
n
me
r
ging sy
m
link
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
me
r
ge-index:
fix longstanding b
u
g in m
e
rging
s
ymlin
k
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C Hamano
Add Release Notes to pr
e
pare
f
o
r 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
r
erere: do not deal with sy
m
links
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rerere: do not skip two
c
onflicted
p
ath
s
next to
e
ach
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
M
e
rge
git:/
/
repo
.
or
.
cz/git-
g
u
i
i
n
t
o
maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
an
o
D
on't modify
CREDITS-F
I
LE if it hasn't ch
a
n
g
ed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
diff-pa
t
c
h
:
Avoid emitting
d
ouble-slas
h
es in
textual
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
Rew
o
rd git
-
am
3-
w
ay f
a
l
lback failure message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge
br
a
nch
'
m
aster' of git:
/
/rep
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
J
u
nio C Ha
m
ano
GIT 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o C Hamano
Update draft
r
e
l
ease notes for 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C
H
ama
n
o
Merge g
i
t://git
.
k
ernel
.
org/p
u
b/sc
m
/gitk/gitk
i
nto maint
commit
|
commitdiff
|
tree
2007-02-17
J
u
nio C Ha
m
ano
Do
not take mode bits
f
rom i
n
d
ex
after type change
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
git-merge: minor fi
x
for n
o
_trivi
a
l_merge_s
t
rat
e
gies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
J
unio
C Hamano
p
rete
n
d-s
h
a1
:
grave
bugfix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
uni
o
C Haman
o
GIT-VERSION-FILE: check
.
/
v
ersion fi
r
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PAT
C
H] g
i
t
k
: Use show-ref ins
t
ead of
l
s-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ha
m
a
n
o
[PAT
C
H] Make gi
t
k wo
r
k reaso
n
ably
w
e
ll
on Cygwin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
Make sure
p
ackedgitwin
d
owsize is multiple of (pagesize
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Add
R
elNotes 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
io C Hamano
Sti
l
l updating 1
.
5
.
0 release no
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Clarify
two back
w
ard incomp
a
ti
b
le reposito
r
y optio
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Makefil
e
: update check-docs target
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
c
m
d
-
list: add gi
t
-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Documenta
t
ion: Drop ful
l
-stop from g
i
t
-
f
ast-import
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ha
m
an
o
G
I
T 1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Junio C H
a
mano
Add
r
ele
a
se no
t
es
t
o
the distribution
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hama
n
o
M
erge
b
r
anch 'm
a
ster'
o
f git://repo
.
or
.
cz
/
g
i
t
-gui
commit
|
commitdiff
|
tree
2007-02-13
J
u
nio
C
Haman
o
Do
c
umenta
t
ion: Moving out o
f
detache
d
HEAD d
o
es
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
"g
i
t-
f
etch --tags $URL"
s
h
ould
not overwrite ex
i
sting
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C Ha
m
a
n
o
fo
r
-ea
c
h-reflog
:
not having
$
GIT_DI
R
/
l
ogs directo
r
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Hamano
Do not
f
orget to
pack obje
c
ts reachable f
r
om H
E
AD reflog
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
A
dd RP
M
t
arge
t
for git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ha
m
ano
M
erge branch 'mas
t
er' of git://rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-12
Ju
n
io C Hamano
Merge git-gu
i
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Jun
i
o C Hamano
Add disc
u
s
si
o
n section to git-tag docume
n
tat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Juni
o
C
H
amano
Te
a
ch git-am to p
a
ss
-p
option down to git-apply
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Document
a
t
i
on: git-rebase
-C<n>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
J
unio
C
Haman
o
M
e
rge
b
ranch
'master'
o
f git://re
p
o
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-02-11
Jun
i
o
C
Hamano
t4
0
16:
t
est quoting funny pathname
s
i
n diff output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-10
Junio C Haman
o
d
iff_f
l
u
sh_name(): take struct diff_o
p
tions
p
arameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-10
Junio C Ham
a
no
wt_s
t
atus_prepa
r
e(): clean up s
t
ructure
i
nitialization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
J
unio C H
a
m
ano
git-fetch
:
document aut
o
matic tag fol
l
owi
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Ha
m
a
n
o
Documentation/git-pull:
d
esc
r
ibe default beh
a
v
i
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
Junio C H
a
mano
r
e
flog: handle
$
nam
e
=> remotes/%s/HEAD mapping consistently
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-08
J
u
n
io C Hamano
M
e
r
g
e branch 'master' of g
i
t://repo
.
or
.
cz/git/fasti
m
port
commit
|
commitdiff
|
tree
2007-02-08
Junio C Hamano
create_symref(): cr
e
ate lea
d
ing
directories as needed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
J
un
i
o
C Hamano
GI
T
v
1
.
5
.
0-rc4
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
J
u
n
i
o C
Hamano
D
o
cumen
t
ati
o
n
:
Add gfi t
o
the main c
o
mman
d
list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Hamano
git
-
add -i
:
update r
e
mo
v
ed
p
a
th c
o
r
r
ectly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hama
n
o
t420
0
:
ski
p
gc-r
e
rere test on s
y
stems wi
t
h non GNU
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Merg
e
b
ranch 'ml/g
i
tk' (early
part)
commit
|
commitdiff
|
tree
2007-02-07
J
u
n
i
o
C
Hamano
for-each-
r
efl
o
g: fix
case f
o
r em
p
ty log director
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Merg
e
branch
'mast
e
r'
o
f gi
t
://re
p
o
.
or
.
cz
/
git/fastimport
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
g
i
t-c
l
o
n
e --reference: work well wi
t
h
p
ack-ref'ed refe
r
e
nce
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
J
u
nio C Haman
o
Remov
e
g
i
t-merge-recur
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Add deprecation notices
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
M
erg
e
branch
'master' of git://repo
.
or
.
c
z/git/fasti
m
port
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Re
m
ove
c
on
t
rib/color
d
i
ff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
J
uni
o
C Ha
m
ano
S
_
IFLNK
!= 0140
0
00
commit
|
commitdiff
|
tree
2007-02-06
J
un
i
o
C
Hamano
annotate: fix for
cvsserve
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C H
a
mano
gitweb: fix mism
a
tched
p
arenthe
s
is
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
J
unio C Ha
m
ano
git-push: a
l
low gl
o
b
bing wildcard refspec
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hama
n
o
gitk: Use
show-ref instead of ls-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio
C
Hama
n
o
F
ix
l
ongstanding misme
r
ge of A
L
L_CF
L
AGS
v
s B
A
SI
C
_CF
L
AGS
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Tea
c
h gi
t
-
r
em
o
te add to fe
t
ch and trac
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C
H
a
mano
blame: docum
e
n
t
--conten
t
s
o
ptio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Ju
n
io
C
Ham
a
no
U
se pretend_s
h
a1_file() in g
i
t-blam
e
and g
i
t
-
mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hama
n
o
Ad
d
pretend_sha1_file() int
e
rfac
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Haman
o
git-blame: no r
e
v means start from the w
o
rkin
g
tree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
bisect
:
it needs
t
o be do
n
e in a working tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
t9
2
00: Work around HF
S
+ issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
J
unio C
H
a
mano
Re
n
ame g
e
t_ident() to
f
m
t_i
d
e
nt
(
)
a
n
d make
it ava
i
l
a
b
le
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C H
a
mano
R
e
vert "Allow bran
c
h
.
*
.
mer
g
e t
o
t
alk abou
t
r
e
mote tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
a
m
ano
Merge branch 'np/dreflog'
commit
|
commitdiff
|
tree
2007-02-04
J
u
nio C Hamano
git-clone -
-
refere
n
ce: sane
r
handling of borrowed sym
r
ef
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Junio
C Hamano
show-b
r
an
c
h -g:
d
efau
l
t to
t
he current branc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
M
erge b
r
anch 'master'
i
n
to np/
d
reflog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
combine-d
i
ff: special cas
e
--u
n
ified=0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
J
u
n
io C Ha
m
ano
Why is i
t
bad
t
o
r
ew
i
nd a branch tha
t
has
alread
y
been
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Ju
n
io
C
Hamano
honor G
I
T
_
REFLOG_A
C
TION in git-commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
fix reflo
g
entri
e
s for "git-branch"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
J
u
nio C Hamano
c
ore
-
t
ut
o
rial:
h
tt
p
refe
r
ence link fix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
Tutori
a
l-2: Adjust git-statu
s
output
t
o recent reality
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Ha
m
ano
Tutori
a
l
: fix asciidoc formatt
i
ng of
"git add
"
section
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-02
Junio C
Hamano
Use "git
c
heckout -
q
" in git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-01
Junio C Hama
n
o
detached HEAD -- finishing
t
ouches
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
J
u
n
io C Hamano
GIT v1
.
5
.
0-rc3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Junio
C
Haman
o
D
o not
u
se
h
a
rdcoded path
t
o xhm
t
l
.
xsl to generate
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Hamano
g
i
t main documentation: point at t
h
e user'
s
man
u
al
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Ju
n
i
o
C Haman
o
Merge branch 'm
a
ster' of git://li
n
ux-
n
f
s
.
o
rg/~bfields/git
commit
|
commitdiff
|
tree
2007-01-31
Junio
C Hama
n
o
t9200:
do not te
s
t
-x bit if
t
h
e
filesystem does not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Jun
i
o C Ham
a
no
t9200: Re-c
o
d
e non-ascii path te
s
t 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
Docum
e
ntatio
n
: "g
i
t-checkout <tr
e
e> <pa
t
h>" takes any
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Junio
C Hamano
Fix git-t
a
g -
u
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-30
Junio C
Hamano
gi
t
-send-email: remo
v
e
debugging output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-30
J
unio C Ham
a
n
o
g
it-b
l
ame: so
m
ewhat better commentin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next