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
git-merge: fail correctly when we cannot fast forward.
2007-03-03
Junio
C
Hama
n
o
g
it-merge
:
fail correctly wh
e
n
we ca
n
not fast
f
orward
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
S
tart
p
r
e
paring
Rele
a
s
e
N
o
tes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C Hamano
Docu
m
entati
o
n: git-re
m
ote
add [-t <bra
n
ch>] [-
m
<branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Jun
i
o
C
H
amano
git-apply: do not fix whitespa
c
e
s
on context lin
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
G
I
T
1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
D
ocum
e
nta
t
ion: des
c
rib
e
"-f/-t/-m" opti
o
ns
t
o "git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Ha
m
ano
di
f
f
--c
c
: fix display of symlink conflicts during
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
Merge bran
c
h 'jc/merge-sym
l
ink' into maint
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C
Haman
o
merge-recur
s
ive: fix longst
a
nding
bu
g
in mergin
g
symlinks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C
H
a
m
a
n
o
m
er
g
e-
i
ndex: fix lo
n
gstan
d
in
g
bug
i
n
mer
g
i
ng s
y
m
lin
k
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Ha
m
ano
A
dd Release Notes to
prepare for 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
mano
r
erere: d
o
not de
a
l with sym
l
i
nks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
H
a
mano
r
erere:
d
o
n
o
t ski
p
two co
n
flicted paths next
t
o
e
a
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Merge gi
t
://repo
.
or
.
cz/git-gui
i
nto maint
commit
|
commitdiff
|
tree
2007-02-25
Jun
i
o C
H
amano
Don't mo
d
ify CR
E
D
I
TS-FILE
i
f it
h
as
n
'
t
changed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ha
m
ano
di
f
f-patch: Avoid e
m
itting double-
s
l
ashes in textu
a
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
J
unio C
Hamano
Rewo
r
d gi
t
-am 3-way fallback
f
ailu
r
e message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
Ha
m
ano
M
erge branch 'master' of git://repo
.
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
Ju
n
io C Hamano
Update
d
raft release notes for 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C H
a
mano
Merge git://git
.
ke
r
nel
.
org/pub/scm
/
gitk
/
gitk
into maint
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hama
n
o
D
o
not take mode
b
i
ts f
r
om
index after type
change
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Jun
i
o C Hama
n
o
git-merge: minor fix
f
o
r no
_
tri
v
i
a
l_merge_strategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio
C
Hamano
pr
e
tend-
s
ha1: grave bugfix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
GIT-VERSION
-
FILE: check
.
/version
first
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PATCH] gitk: Use show-ref
instead of ls-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hama
n
o
[P
A
T
C
H] Mak
e
gitk work reason
a
b
l
y
wel
l
on Cyg
w
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Haman
o
Make
s
ure pa
c
ked
g
itwi
n
d
o
wsize is multiple
o
f (pagesi
z
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
H
a
mano
A
d
d
RelNotes 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
un
i
o C Hamano
S
till up
d
ating 1
.
5
.
0 release
notes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Cl
a
rify t
w
o b
a
ckwa
r
d in
c
ompatib
l
e reposito
r
y op
t
ions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
unio
C Hamano
M
a
k
e
f
ile: upd
a
te check-docs
targ
e
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
unio
C
H
a
mano
cmd-list:
ad
d
git-
r
emote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
Documen
t
ation: Dro
p
ful
l
-
stop from git-fast-import
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Ha
m
a
no
GIT 1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Add
r
e
lea
s
e notes to t
h
e dist
r
ibution
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C H
a
mano
Merge b
r
anch
'maste
r
' of
g
it://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-13
J
u
ni
o
C
H
a
m
a
no
D
o
cument
a
ti
o
n: Movi
n
g
o
ut of detached HEAD does not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C Hamano
"
g
i
t
-f
e
tch --
t
ags $URL" sh
o
uld
n
ot
overwri
t
e
e
xisting
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
amano
for-each-reflog: not having $GIT_DIR/l
o
g
s
directory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C H
a
man
o
Do not f
o
r
g
et to pack
o
bj
e
ct
s
r
e
acha
b
le from H
E
A
D
refl
o
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Add
R
PM target for
g
it-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-13
J
u
n
io
C
Hamano
Merge branch 'ma
s
ter' of gi
t
://repo
.
or
.
c
z
/git
-
gui
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Me
r
ge git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Add discussi
o
n se
c
tion
t
o
git-tag
d
oc
u
mentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Juni
o
C H
a
m
a
n
o
Teach git
-
am
to
p
ass -p option down
to git-apply
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hama
n
o
Do
c
umentati
o
n: gi
t
-reb
a
se -C<n
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-12
Juni
o
C Hamano
Merge bran
c
h 'master' of
git://repo
.
o
r
.
cz/git
/
fastimport
commit
|
commitdiff
|
tree
2007-02-11
J
u
nio C Haman
o
t4016: t
e
st
q
uoting fu
n
n
y pathna
m
es in d
i
ff output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-10
Junio
C
H
amano
diff
_
flus
h
_name()
:
take
struct diff_options p
a
rameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-10
Junio C Hamano
w
t
_s
t
a
tus_prepa
r
e(): clean up s
t
ructure
i
n
iti
a
lization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
Junio
C Hamano
git
-
fet
c
h:
d
ocume
n
t automa
t
ic tag follow
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
J
u
n
i
o C Hamano
D
o
cume
n
tat
i
on/git-pull: describe defau
l
t
beha
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
reflog: handle $name =>
r
emotes/%s
/
HEAD mapping consi
s
tent
l
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-08
Ju
n
io C Hamano
M
erge branch 'maste
r
'
of git://repo
.
or
.
cz/git/fastim
p
ort
commit
|
commitdiff
|
tree
2007-02-08
J
unio C Hamano
create_symr
e
f(): create
l
ead
i
ng d
i
rectories
a
s
n
eeded
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
J
u
nio C Hamano
G
IT v1
.
5
.
0-
r
c4
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
Documentation: Add gfi to the main comman
d
list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Hama
n
o
git-add -i: u
p
date remo
v
ed pa
t
h correctly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Ha
m
ano
t4200: skip
gc-re
r
ere t
e
st on systems with non GNU
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C Hamano
M
erge branch 'ml/gi
t
k' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
for-each-reflog: fix case
f
or
e
m
pt
y
log directory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
J
u
nio C Hamano
Mer
g
e
bran
c
h 'm
a
st
e
r'
o
f git://repo
.
o
r
.
cz
/
git/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
git-clone --r
e
ference: wo
r
k well with
p
a
c
k-re
f
'
ed r
e
feren
c
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
J
unio C Hamano
R
e
move git-m
e
rge-recur
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C Ha
m
ano
Add deprecation no
t
i
c
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-07
Junio
C
Hamano
Merge branch
'
m
aster' o
f
g
it://
r
epo
.
or
.
c
z
/
git/fastimport
commit
|
commitdiff
|
tree
2007-02-07
Junio C Ha
m
an
o
Remove co
n
trib/colord
i
ff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
S_IFLNK !
=
0140
0
00
commit
|
commitdiff
|
tree
2007-02-06
Junio
C
H
amano
annota
t
e: fix for cv
s
s
erver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
gitweb: fix mism
a
tc
h
ed parent
h
esis
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
gi
t
-p
u
sh: allow g
l
obbing wildcard refspec
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
gitk: Use
s
ho
w
-
r
ef
i
ns
t
ead of
l
s-
r
e
m
ote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
Fix lon
g
s
tand
i
n
g mismerge of
ALL_CFLAGS vs BAS
I
C_CFLAGS
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
amano
T
each git-re
m
ote add to fetch an
d
track
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Ham
a
no
blame: document --cont
e
nts
o
p
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Ju
n
io C
H
amano
Use pre
t
en
d
_sha1_file() in git-blame and git-merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C
Hamano
Add pretend_sha1_file() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
J
u
n
i
o
C
H
amano
git-blame: no rev means
s
t
a
r
t
from the work
i
ng tre
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
bisect: it
n
eeds to be done in a w
o
rking
t
ree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
Haman
o
t
9200: Wo
r
k aro
u
nd HFS+ issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Renam
e
g
e
t_ident
(
) to
f
mt_ident() and make
it avai
l
able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio
C H
a
mano
R
e
v
e
rt "Allow branch
.
*
.
merge to talk about remot
e
trac
k
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
amano
Merge branch
'
np/dreflo
g
'
commit
|
commitdiff
|
tree
2007-02-04
J
u
n
io C Hamano
git-clone --referenc
e
: saner
hand
l
in
g
of borr
o
w
ed symrefs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Junio
C
Hamano
show-
b
ranch
-
g
:
def
a
ult to the current branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Ju
n
io
C
Hamano
M
e
rge bran
c
h
'mast
e
r' into np/
d
r
e
flog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
J
u
nio C
Hamano
c
o
m
b
ine-diff: special case --u
n
ified=0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
Why is
i
t
b
a
d to
r
e
wind a branch
t
hat has already be
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Junio C
H
amano
honor GIT_REFLOG
_
ACTION in git-commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Ham
a
no
fix reflo
g
ent
r
i
es for "git-branc
h
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
J
unio C Hamano
core-tut
o
ri
a
l: http referen
c
e link fix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Ju
n
io
C Hamano
Tu
t
o
r
ial-2: Adjust git
-
st
a
tus output to
rec
e
nt realit
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
T
u
torial: fix
asciidoc fo
r
m
a
t
t
ing
o
f "git add" section
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-02
Ju
n
io
C Hamano
Use "git
checkout -q" in git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-01
Junio C Hamano
detache
d
H
E
AD
-- finish
i
ng 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
Ju
n
io C H
a
mano
Do
n
ot use h
a
rdcoded path to
x
h
mtl
.
xsl t
o
generate
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Junio C Ham
a
no
git
m
ain
documentation:
p
oint at the user's manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-01-31
Juni
o
C Ham
a
no
Merge branch 'ma
s
ter'
o
f git://linux-
n
fs
.
org/~bfields/git
commit
|
commitdiff
|
tree
next