repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
i18n: only extract comments marked with "TRANSLATORS:"
2014-03-31
Charles Bailey
t
e
sts:
don't rely on stre
r
ro
r
text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: make git_f
n
match() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
harles Bailey
mergetool:
Remove explicit referenc
e
s to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rles Bail
e
y
stash tests:
st
a
sh
c
an lose data
i
n
a
file rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
sta
s
h:
D
o
n't overwrite files that ha
v
e gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es
B
ailey
Documentation: Describe other situations where -z
affe
c
ts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
C
h
ange xdl_merg
e
t
o
generate output even
f
or null merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
rles Baile
y
t60
2
3: merge
-
file fails
to o
u
tput anything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
m
ergetool: fix runni
n
g me
r
getool in
sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
me
r
getool: A
d
d a
t
e
st for ru
n
ning
m
ergetool in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
es Bailey
mergetool
:
r
e
s
pect autocrlf b
y
using che
c
k
o
u
t-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bailey
me
r
getool: Don't keep tempo
r
ary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles B
a
iley
mergetool
:
Add
p
rompt to co
n
tin
u
e
after f
a
i
ling t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bailey
Add -y
/
--
n
o-pro
m
pt
optio
n
to m
e
rg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/spac
e
in
c
onsist
e
ncies in git-merg
e
to
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Bailey
git-archive:
w
ork in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
les
Bai
l
e
y
Make
git a
r
c
hive respect core
.
autocrlf when cre
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add ne
w
test to demons
t
rate git
a
r
c
hive co
r
e
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
merg
e
-t
o
ol do
c
umentation: d
e
s
c
rib
e
cu
s
tom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
git-mergeto
o
l documentaiton: show toolnames in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very b
a
s
ic test scri
p
t for git merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach git mergetool to
u
se
c
u
stom commands defi
n
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Ba
i
ley
Changed an inte
r
nal va
r
iable of
m
erg
e
t
ool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
iley
T
idy u
p
git
m
erge
t
ool
'
s backup fi
l
e
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk: Fix the
M
akefile to cop
e
with s
y
s
tems
l
acking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
e
y
R
emove old generated files from
.
g
i
t
ignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles B
a
i
l
ey
Fix git-instaweb breakage on MacOS
X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles Baile
y
Fix clon
e
not to ignore
d
epth
w
hen
p
e
rforming a lo
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
