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 'nd/clone-depth-zero'
2010-08-20
Charles Bailey
me
r
g
etool: Remo
v
e e
x
p
l
icit references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charle
s
B
aile
y
s
t
ash te
s
t
s
: sta
s
h
can
lose data i
n
a
f
i
l
e re
m
oved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Baile
y
stash: Don't
o
v
e
rw
r
i
te files that h
a
ve
g
one
from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
D
ocumen
t
a
tion: Describ
e
othe
r
s
ituati
o
ns where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bai
l
ey
Change xdl
_
m
e
rge
t
o generate output even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merge-fil
e
fails to o
u
tput anyth
i
ng for a de
g
enera
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
me
r
getool:
fix
r
unning mergetool in sub-di
r
ectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
me
r
getoo
l
:
A
dd a test for
r
unning
merg
e
too
l
in a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetool: respect autocrlf b
y
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
merge
t
ool: Don't
k
eep tempor
a
r
y
merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Ba
i
l
e
y
merge
t
ool:
A
dd prompt
to continue a
f
ter
f
aili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
l
ey
Ad
d
-
y/
-
-no-prompt opti
o
n to
me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bai
l
e
y
Fix s
o
me tab/space incon
s
istencies in git-mergetoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rl
e
s Bailey
git-archive: work in bare
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive res
p
e
c
t core
.
autocrlf whe
n
creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new
t
est to demonstrate git ar
c
h
i
ve
c
ore
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
ar
l
es Bailey
merge-tool documenta
t
ion: describe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
ar
l
es Bail
e
y
git-mergetool docum
e
ntaiton:
show toolna
m
es
i
n typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Add
a very b
a
sic test sc
r
ipt for git m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
T
each git merge
t
ool to use
c
u
sto
m
com
m
ands def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an
i
n
ternal variable of mergetool to s
u
p
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
T
i
d
y up git merge
t
ool's bac
k
up file beha
v
i
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
rles Bailey
gitk:
Fix t
h
e Makefile to cope with syst
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s
B
a
iley
Remove old generated
files from
.
gitign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-insta
w
eb brea
k
a
g
e on
M
a
c
O
S
X
d
ue to
t
h
e
limi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bail
e
y
Fix
c
lone not to
ignor
e
depth when p
e
rformi
n
g a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
