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
Git 1.7.3 rc1
2010-08-20
Cha
r
les Bailey
mer
g
e
tool: R
e
m
o
ve explic
i
t r
e
ferences to /dev/
t
t
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
B
a
i
ley
stash tests
:
stash can lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
iley
s
t
ash: Don't overwrite files that have gone
fr
o
m
t
he
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
Bailey
Docum
e
ntation: Des
c
r
i
be o
t
her situations
where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Ba
i
le
y
Change xdl_merge to g
e
nerate outpu
t
even
f
or null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t
602
3
: merge-file fails
t
o output
a
nything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles Bail
e
y
mergetoo
l
: fix running
m
ergetool in sub-d
i
rectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
rles Bailey
mergeto
o
l: Add a test for r
u
nning mergetoo
l
in
a
su
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles
B
a
iley
m
e
r
g
etool: r
e
spect autocrl
f
b
y
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Baile
y
merg
e
t
o
ol: Don't keep
t
emporary
merge f
i
les
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
mergetool: Add
prompt to co
n
t
inue after faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Baile
y
Add -y/--no-prom
p
t
option to
m
e
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix so
m
e ta
b
/spac
e
inconsistencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Bailey
git-archive:
work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
a
k
e
g
i
t archive re
s
pec
t
core
.
autocrl
f
when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add n
e
w test to demonstr
a
te git archive c
o
re
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Ba
i
ley
merge-tool docu
m
entation: describe cust
o
m command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
git-mergeto
o
l
d
ocumen
t
aiton: sho
w
toolnames
in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic tes
t
script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
T
e
a
c
h
git m
e
r
geto
o
l
to u
s
e custom commands d
e
fine
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Change
d
an int
e
rna
l
variab
l
e of merg
e
too
l
t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Baile
y
Ti
d
y up
git mergetool's
b
a
c
kup file be
h
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk: Fix the Makefile to
c
ope with syste
m
s lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
a
rles Bai
l
ey
Remove ol
d
generated files fro
m
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
i
x git-
i
nstaweb breakag
e
on MacO
S
X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bailey
Fi
x
c
l
o
ne not to ignore depth when performi
n
g a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree