repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' of git://repo.or.cz/git-gui
2007-04-18
Junio C Hamano
Custom low-le
v
e
l
m
er
g
e driver:
c
hange t
h
e
c
onfigurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hama
n
o
A
llow the default low-level merg
e
driver
t
o be c
o
nfigure
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
C
u
s
t
om low-level merge
d
river
s
upport
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge
branch 'fl/
c
v
sserver'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Hamano
Update dr
a
ft release not
e
s for 1
.
5
.
2 with a
c
c
u
m
u
lated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Haman
o
Start
p
reparin
g
f
o
r 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge branch 'mas
t
er'
of git:/
/
r
e
po
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
M
erge branch 'maint' o
f
git://repo
.
or
.
c
z/git-gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Ham
a
n
o
Merge bran
c
h '
j
c
/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C H
a
mano
Add a
d
emonstration/test of customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
Hama
n
o
Allo
w
s
p
ec
i
fyin
g
s
p
eciali
z
ed me
r
g
e
-backen
d
p
e
r path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Ha
m
ano
gi
t
-gui: Hono
r
TCLTK
_
P
A
T
H
if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
m
e
rge-recursive: separate ou
t
x
d
l
_merge() in
t
erface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C H
a
mano
Allow more than true/false to
attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Ma
k
e s
u
re quickfetch
is not fooled with a previ
o
us
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
Merge
branch 'js
/
wr
a
p-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hama
n
o
s
e
n
d-email: do n
o
t leave
a
n
empt
y
C
C: line if
no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Ha
m
ano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hama
n
o
C
h
a
n
ge at
t
ribute n
e
gatio
n
ma
r
ker from '!' t
o
'
-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
a
m
ano
D
e
f
ine a
b
uilt-in attribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Ha
m
ano
attr
i
bute m
a
cro suppo
r
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Makefi
l
e: add pa
t
ch-ids
.
h back
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Fix 'dif
f
' attribute se
m
an
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
Ham
a
no
Fix 'crlf' at
t
ribut
e
seman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Me
r
ge git://gi
t
2
.
kernel
.
org/pub/scm/gitk
/
g
itk int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
ma
n
o
Teach 'd
i
ff' about 'diff
'
at
t
ribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
un
i
o C
H
amano
A
dd basic infras
t
ructure to assign attributes to p
a
th
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
uni
o
C Hamano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Repl
a
ce a pair of
pa
t
c
hes
with update
d
ones for subpr
o
ject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
H
a
m
a
n
o
D
o
not
d
efault t
o
--no-index when given tw
o
directori
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
J
un
i
o C Hamano
Merge branch 'jc/c
h
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fi
x
git {log,show,
.
.
.
} --pr
e
t
ty=emai
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Docum
e
ntation
:
--cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Ref
a
ctor patch
-
i
d
f
iltering out of
g
it
-
c
herry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pretty=format
:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
Merge b
r
anch
'
m
aint
'
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Haman
o
f
sck: do n
o
t complain on
d
e
t
ached HEA
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o C Hamano
git-fetch: u
s
e f
e
tc
h
-
-tool
pick-rref
to avo
i
d local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-
f
e
tc
h
-
-tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
t3030:
merge-recursive backend t
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
man
o
merge-recursive:
handle D
/
F c
o
nf
l
i
c
t case more c
a
refully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
m
e
r
g
e-re
c
ursive: do not
b
arf on
"
to
b
e rem
o
ved" e
n
t
ries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
T
reat
D/F c
o
n
flict
entry more carefully in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
t1000: fi
x
case
table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
m
a
no
s
h
ortl
o
g -
w
:
make wra
p
-
lin
e
beh
a
viour
o
pti
o
n
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
H
a
mano
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge
branch 'jc/merge-s
u
bt
r
e
e'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Merge branch '
j
s
/
fetch-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge
b
ran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Document
a
t
i
on/cmd
-
lis
t
.
made to
.
g
i
tign
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
S
ta
r
t
1
.
5
.
2 cyc
l
e by prepareing
R
e
lNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
erge branc
h
'
j
c
/
read-t
r
e
e
-
d
f' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Ha
m
ano
Prepare for
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
A ne
w
m
e
r
ge str
a
gety 'subtr
e
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C Ha
m
ano
git-push to m
u
ltiple locat
i
o
n
s does no
t
stop
at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
a
no
git-pu
s
h
reports
t
h
e
U
RL
after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
Me
r
ge branch 'jc/index-out
p
u
t
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
Merge bran
c
h 'fp/mak
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Me
r
ge branch '
c
c/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
amano
Merge
branch 'jc/checkout' (ear
l
y part
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Docum
e
ntati
o
n: ti
g
hte
n
depen
d
ency for git
.
{h
t
ml,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
g
i
t-bisec
t
: a
l
low
bisecting with only one b
a
d commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
t60
3
0
: add a
bit
m
ore tests t
o
g
i
t
-
b
isect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ha
m
ano
git-bisect: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Ren
a
me
add_file_
t
o_index(
)
to add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Renam
e
s
tatic variable wr
i
t
e
_index
t
o
u
pdate_inde
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Rename internal
function "add_file_to_cache" in
b
u
iltin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Propaga
t
e cache er
r
or internal to refres
h
_cache() vi
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Fix bog
u
s error
m
es
s
a
ge from merge-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependency of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
RPM spec: include g
i
t-
p
4 in t
h
e list of all
p
ackag
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: make
s
orting really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fi
x
s
w
itching to a branch with D/F when cu
r
rent
b
r
anch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Fix twoway_merg
e
th
a
t passed d/f conf
l
i
c
t
m
arker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-tree --pref
i
x=dir
/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Ha
m
ano
u
npack-trees: get ri
d
o
f *indpos parame
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
u
n
pack_trees
.
c
: pass unp
a
ck_
t
rees_options structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
amano
add_cache_entry(): remov
a
l of file foo
does no
t
con
f
l
ict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge branch '
j
c/bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Ha
m
ano
M
e
rge branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge branc
h
'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ha
m
an
o
Merge bran
c
h 'post1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
ama
n
o
Me
r
ge bran
c
h 'p
o
st1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Mer
g
e br
a
n
ch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-read-t
r
ee --index-
o
u
tput=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_INDEX_OUTPU
T
:
a
l
l
o
w
p
lumbing
t
o out
p
u
t
to an alternati
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
ch
e
ckout: allow de
t
ach
i
ng to H
E
AD even
when switc
h
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hamano
G
IT
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Mer
g
e
1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next