repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po
2015-06-25
Charl
e
s Bailey
F
i
x
d
e
fini
t
ion
o
f ARRAY_
S
IZE for non-gcc b
u
ild
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Cha
r
les Bailey
contrib/subtree:
s
mall tidy-u
p
to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
harles Bailey
contrib/subtree: fix broken &&-
c
ha
i
ns
a
nd revea
l
e
d
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles B
a
iley
c
o
n
trib/subtre
e
: use
t
a
bs consitently for
indenta
t
ion
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
ailey
difftool: don'
t
a
s
s
u
me that default sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bai
l
ey
merge
t
ool: don't require
a work tr
e
e
for --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
arles Bailey
Fix contrib/subt
r
ee Makefi
l
e to patc
h
#! l
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bai
l
ey
filter-branch: eliminate duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Cha
r
les Bailey
c
ompat
/
bs
w
ap
.
h
:
detect e
n
dianness on more p
l
atforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles
B
ailey
tes
t
s: don't rely o
n
st
r
e
r
ror t
e
xt when testi
n
g
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
ailey
dir
.
c: make git_fnmatch(
)
not inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
r
l
e
s
Ba
i
ley
mergeto
o
l: Remove explicit references to /
d
e
v
/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles B
a
il
e
y
stash tes
t
s: stash can
lose da
t
a in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
ey
s
t
ash: Don'
t
overwrite
f
iles that have gone fro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
rles Bailey
Documentatio
n
:
De
s
cribe other
s
i
tuat
i
ons w
h
ere -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
Chan
g
e
xdl_merge to genera
t
e outp
u
t even for n
u
ll merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s B
a
i
ley
t
6
0
2
3
:
mer
g
e-f
i
le fails to output
a
n
y
t
hing f
o
r
a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
me
r
getool: fix
running mer
g
etool in sub-dire
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bail
e
y
m
e
rgetool:
A
dd
a
test for running mergetool in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merget
o
ol: respect auto
c
rlf by using checkout-inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Ba
i
le
y
mergetool: D
o
n
'
t keep temporary
m
erge f
i
l
e
s u
n
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bai
l
e
y
mergetool: A
d
d promp
t
t
o
continue
after failin
g
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-prompt o
p
ti
o
n to merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es
B
a
iley
Fix some tab/s
p
ace
i
nconsistencie
s
in gi
t
-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
r
les Ba
i
ley
git-archive:
w
ork in bar
e
r
e
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ma
k
e git ar
c
hive
r
e
s
pect
core
.
au
t
ocrlf
w
h
en creati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Ad
d
new test to demonstra
t
e git
a
r
chive
c
ore
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
m
e
rge-tool do
c
umentat
i
on:
d
escribe custom comman
d
u
s
a
ge
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles
B
ailey
git
-
me
r
getool
d
o
c
umenta
i
t
o
n: s
h
ow
t
oolna
m
es in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
A
dd a very basic tes
t
scrip
t
for git merget
o
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teac
h
git merge
t
ool to
u
se custom c
o
mmands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles
Bailey
Changed an i
n
ternal var
i
able o
f
mergetool to s
u
pport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy
up git
merg
e
tool's backup
file
b
ehavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles Bai
l
ey
gitk:
F
i
x
the Makefile to c
o
pe w
i
th s
y
stems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Re
m
o
v
e
o
ld ge
n
erate
d
f
iles from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fi
x
git-inst
a
web b
r
e
a
k
a
g
e on MacOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Ba
i
ley
Fix clo
n
e not to i
g
n
o
re depth when p
e
rforming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree