repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
i18n: remove obsolete comments for translators in diffstat generation
2014-03-31
Char
l
es Bail
e
y
t
e
sts: don't rely on
stre
r
ror text whe
n
testing rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
dir
.
c: m
a
ke git_fnmatch(
)
not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
harl
e
s
Ba
i
ley
mergetool: Remove
explicit
references
t
o
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rle
s
Bailey
stash tests
:
stash ca
n
los
e
d
a
t
a in a
f
ile re
m
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
stash: Don'
t
overwrite file
s
that
have go
n
e from
t
he
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arles
Bailey
Documentatio
n
: Describ
e
o
ther situati
o
ns w
h
ere
-z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
Change xd
l
_merge
t
o generate out
p
ut ev
e
n fo
r
nu
l
l
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bailey
t6023
:
merge-file fails
to output
anything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergeto
o
l: fix ru
n
ning
m
ergetool in s
u
b-direct
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
ergetool: Ad
d
a
test f
o
r
ru
n
ning merget
o
ol i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetool
:
r
espect
a
ut
o
crlf by using ch
e
c
kout-i
n
d
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
e
r
g
etoo
l
: Don't keep temporary mer
g
e
files
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
e
rgetool: Add pro
m
pt to continue af
t
er failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
A
dd -y
/
--no-prom
p
t opt
i
on to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles
Ba
i
ley
Fix some ta
b
/spa
c
e inconsistencies in git-merge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Bailey
git-archiv
e
:
work
in
bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bai
l
ey
Make
git archive respect c
o
r
e
.
aut
o
c
rlf
w
hen creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bailey
Add new te
s
t
t
o
demonstrate g
i
t archive co
r
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
merge-too
l
documentation: describe custom
c
ommand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
git-mergetool documentaiton: s
h
o
w
toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Add a very
b
asic tes
t
script for g
i
t merge
t
o
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tea
c
h git mer
g
etool to
use
custom commands def
i
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
h
ang
e
d an internal variable
of merge
t
ool to
s
upport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
es
B
ai
l
ey
Tidy up git mergeto
o
l
'
s
backup fil
e
behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles
Bailey
gi
t
k: F
i
x the Makefile to c
o
pe with system
s
lac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harles B
a
iley
Remove old generated files from
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
i
x git-instaweb breakage o
n
MacOS X due to the limit
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Baile
y
Fix
c
lone not to ignore depth when perf
o
r
ming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree