repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-checkout: fix "eval" used for merge labelling.
2007-03-14
Jun
i
o C Hamano
git-
c
heckout: fix "
e
v
a
l" used f
o
r merge labellin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-13
Junio
C Hamano
Merge
b
ranch 'maint' of git:
/
/repo
.
o
r
.
cz/git/f
a
stim
p
ort
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C
H
a
mano
Me
r
ge bran
c
h 'maint' of git:
/
/r
e
po
.
or
.
cz/git
-
gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-11
Junio C Ha
m
ano
Merge branch 'maint' o
f
git://l
i
n
u
x-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Jun
i
o
C
H
am
a
no
Me
r
ge br
a
nch
'
m
a
ster
'
of git:
/
/r
e
po
.
or
.
cz/gi
t
-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
g
i
t-commi
t
: cd to top before
showing
t
he
f
i
nal stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
unio
C
Hamano
Merg
e
branch 'm
a
int-for-junio' of git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Junio
C
Hamano
git
-
merg
e
:
f
a
il corre
c
tly whe
n
we cann
o
t fast forward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
Start
preparing Release
N
otes f
o
r 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio
C Hamano
Document
a
tion: git-remote add [-t
<b
r
anch>] [-m
<
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
Hamano
git-apply: do
not f
i
x whitesp
a
ces on context lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
a
man
o
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 Ha
m
a
n
o
Documentation: describ
e
"-f/-t/-m" options to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C
Hamano
diff --cc:
f
ix
disp
l
ay of symlink conflicts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
Merge
b
ranc
h
'jc/m
e
rge-s
y
mli
n
k'
i
n
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge
-
recursive: fix lon
g
standi
n
g bug in merging
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Ham
a
no
m
e
rge
-
index: fix
l
ongst
a
n
ding bug in merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
mano
A
dd
R
elease Notes t
o
prepare
f
or 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Hamano
rerere: do not de
a
l with symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C Hamano
rerere: do no
t
skip
t
wo conflicted paths ne
x
t
to eac
h
.
.
.
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
-
gui into m
a
int
commit
|
commitdiff
|
tree
2007-02-25
Junio
C Hamano
Don't modify
CREDITS-FI
L
E if it hasn't c
h
anged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
io C Hamano
diff-pat
c
h: Avoi
d
emi
t
t
i
ng
dou
b
le-slashes i
n
textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
unio C Hamano
R
eword gi
t
-am
3-way fallback
failure m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Ham
a
no
Mer
g
e bra
n
ch 'mas
t
er' of git://repo
.
o
r
.
cz/gi
t
-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
G
I
T 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 release notes for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
io
C Ham
a
no
Merge git://git
.
k
e
r
nel
.
org/pub/scm/gitk/gitk into maint
commit
|
commitdiff
|
tree
2007-02-17
Ju
n
io
C
H
a
mano
Do
n
o
t take mode bits from index afte
r
type ch
a
nge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C
H
aman
o
git
-
me
r
ge: minor fix for no_trivial_merge_strategie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
J
unio C Hama
n
o
pre
t
en
d
-s
h
a1:
g
rave b
u
gfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Hamano
G
I
T-
V
ERSION
-
FILE:
c
h
e
ck
.
/
version first
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
[
P
ATCH] gitk: Use sh
o
w-ref instead
o
f ls-re
m
ote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
no
[PATCH] Make gitk
w
ork reason
a
bly well on Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
a
ma
n
o
Make s
u
re
pack
e
dgitw
i
nd
o
ws
i
ze
i
s multiple of
(
page
s
ize
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Add RelNotes
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Still
u
pdating 1
.
5
.
0 release not
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
m
a
no
Cla
r
ify two backward incompatible reposi
t
or
y
opt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
i
o C
H
ama
n
o
Ma
k
e
f
i
le:
u
p
d
a
t
e check-do
c
s ta
r
get
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
cmd-list: a
d
d git-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Hamano
Docu
m
entatio
n
: Dr
o
p full-st
o
p
f
r
om
git-f
a
st-i
m
p
o
rt
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio
C Hamano
GIT
1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
J
unio C
H
amano
Ad
d
releas
e
note
s
t
o
the distrib
u
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Hamano
Merge branch 'master'
of
g
it:
/
/repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Doc
u
mentation: Moving out
o
f detached
H
E
AD does not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
a
m
a
no
"
git-fetch --
t
a
g
s $URL" should not overwrit
e
exi
s
ti
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
Hamano
fo
r
-
each-re
f
log: not ha
v
ing $GIT_DIR/lo
g
s direc
t
ory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio
C
Hama
n
o
Do not forget
to pack objects re
a
c
hable
f
rom HEAD reflog
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
unio C Hamano
Add RPM target f
o
r git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Merge branch 'mas
t
er' of g
i
t://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-02-12
J
u
n
i
o C H
a
m
ano
Merge gi
t
-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Juni
o
C Ham
a
no
Add disc
u
s
s
ion s
e
ction to git-ta
g
d
o
cumentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Ju
n
io C Hamano
Teach git-
a
m to pass -p op
t
ion
down to gi
t
-apply
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Documen
t
ation: git-rebase
-C<
n
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
J
u
nio
C
Ham
a
no
Merge branch 'master' of git://
r
epo
.
or
.
c
z
/
g
i
t
/
fastimpo
r
t
commit
|
commitdiff
|
tree
2007-02-11
Junio C Ham
a
no
t4016: t
e
st quoting funny p
a
thname
s
in
diff
o
utput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio
C
Hamano
diff_flush_name(): take struct diff_options pa
r
am
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Jun
i
o C Hama
n
o
wt_status_prepa
r
e(): clean up s
t
ruct
u
re
i
n
i
t
ial
i
zation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
gi
t
-
fetch: document autom
a
t
i
c tag following
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Ju
n
io C Hamano
Documentation/gi
t
-pull
:
describe d
e
faul
t
be
h
avio
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
reflog: handl
e
$name => remotes/%s/
H
EAD
mapping cons
i
s
t
e
ntly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-08
Ju
n
i
o C Hama
n
o
Merge branch 'master' of
git
:
//re
p
o
.
or
.
cz/g
i
t/fastimpor
t
commit
|
commitdiff
|
tree
2007-02-08
J
u
n
io C Ha
m
ano
create_symre
f
(): cre
a
te leading
d
i
recto
r
ies as nee
d
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
Hamano
GIT v1
.
5
.
0-rc
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C Hamano
Do
c
umentation: Ad
d
gfi to the main com
m
and
list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C
H
amano
git-add -i: upda
t
e rem
o
ved path c
o
rrectly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Jun
i
o C H
a
mano
t420
0
: skip gc-rerere
t
e
st on s
y
stems with non GNU
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Ham
a
no
Merge
b
r
a
n
ch 'ml/gitk' (early part)
commit
|
commitdiff
|
tree
2007-02-07
Junio C
H
amano
for-eac
h
-r
e
flog: fix
c
ase for empty log
d
i
r
ector
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Ju
n
io C
Hamano
Merge
bran
c
h 'mas
t
er' of
git://r
e
po
.
or
.
cz/
g
it/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C H
a
mano
git-c
l
on
e
--referen
c
e
:
work wel
l
with pack-ref'ed reference
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C Ha
m
ano
Remove gi
t
-merg
e
-recur
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Junio C Hamano
Add d
e
preca
t
ion notices
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-07
Juni
o
C Hamano
Merge
br
a
nch '
m
aster' of git:/
/
repo
.
o
r
.
c
z
/
gi
t
/fast
i
m
p
ort
commit
|
commitdiff
|
tree
2007-02-07
J
u
nio C Ham
a
no
Remove contrib/colordiff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
S_IFLNK != 0140000
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hamano
ann
o
tate: fix for cvsserve
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio
C Ham
a
no
gitweb: fix mismatched parenthesis
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio
C H
a
m
a
no
git-
p
ush
:
allow globbin
g
wildcar
d
r
efspe
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C Hama
n
o
g
i
tk: Use sh
o
w-ref inste
a
d of ls
-
remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-06
Junio C H
a
mano
Fix longs
t
anding mism
e
r
g
e of ALL_
C
F
L
AGS vs BASIC_CFLAGS
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
amano
Tea
c
h gi
t
-remote add to
fetch
a
nd tra
c
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
blame:
do
c
u
ment -
-
content
s
option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hamano
Use pretend_
s
ha1_
f
ile() i
n
gi
t
-blame a
n
d git-merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Ha
m
an
o
Add pretend_sha1_file() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
unio C Hamano
git-blame: no rev me
a
ns
start f
r
om the
w
orking tr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Ju
n
io C Hamano
bisect
:
it 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 Hamano
t9200: Work aroun
d
H
FS+ issu
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
J
u
nio C Ham
a
no
Rename get_ident() to fmt_ident() and
m
ake it available
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C Hama
n
o
R
evert "Allow branch
.
*
.
merge to tal
k
a
bout remote tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-05
Junio C
H
amano
Me
r
g
e
branch 'np/dreflog'
commit
|
commitdiff
|
tree
2007-02-04
Junio C Hamano
git-clone --r
e
ference: sa
n
er handling
o
f b
o
rrowe
d
symrefs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
unio C Ham
a
no
s
how-b
r
anch
-
g: default
to the current
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
u
n
io
C Hama
n
o
Me
r
ge branch
'master' i
n
t
o
np/dreflog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
J
u
nio C Hamano
comb
i
n
e-dif
f
: specia
l
c
a
s
e
--unified=0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-04
Junio
C
Hamano
Why
is it bad to rewind
a
branch tha
t
has
alr
e
ady
b
een
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio
C
Hama
n
o
honor GIT_REFLOG_ACTION in git-commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
f
i
x reflog e
n
tries for "git-branch"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-03
Junio C Hamano
c
ore-tutorial: http referenc
e
link fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next