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-stash: use update-ref --create-reflog instead of creating files
2015-06-25
Charle
s
Ba
i
ley
Fix defi
n
ition o
f
ARRAY
_
SIZE for non-gcc buil
d
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
difftool: don't ass
u
me that d
e
fa
u
lt
sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Ba
i
ley
mergetool: don't
requir
e
a work t
r
e
e
f
o
r
--tool-he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles
B
a
iley
Fix contrib/s
u
b
t
ree
Makefile to patch #!
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charl
e
s Bailey
filt
e
r-branch: el
i
minate duplic
a
te mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/bswap
.
h
: detect endi
a
nn
e
ss
on mor
e
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Bailey
tests: don't rely on strerro
r
text when tes
t
i
ng rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
dir
.
c: make
g
i
t_fnm
a
t
ch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
merge
t
ool: Remove ex
p
licit references to
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rles Bailey
s
t
a
sh tests: sta
s
h can lose data in a
file rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash: Don'
t
o
verwrite files that have gon
e
from t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
Documentation: Desc
r
ibe ot
h
er s
i
tuations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bailey
C
h
a
n
g
e
xdl_merge t
o
generate output even
f
or
n
ull merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
l
ey
t6023: merge-file
f
ails to o
u
tpu
t
a
n
yth
i
n
g
for a de
g
enerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les Bai
l
ey
mergetool: fix ru
n
ning
m
ergetoo
l
in sub-direct
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool:
A
d
d a test for run
n
ing
m
ergetool in
a
s
ub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merg
e
t
o
ol: respe
c
t a
u
tocrlf
by u
s
ing checkou
t
-ind
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
e
rget
o
ol: Don
'
t
k
ee
p
tempor
a
ry merge files unle
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
e
rgetool: Add pro
m
p
t to
c
ontinu
e
after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rle
s
Bai
l
ey
Add -
y
/-
-
no-p
r
o
mpt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Ba
i
ley
F
i
x
some tab/space incon
s
istencies
in
g
i
t-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
ailey
git-
a
rchi
v
e: wo
r
k in ba
r
e repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
Make g
i
t archi
v
e
r
es
p
ect co
r
e
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new te
s
t to demo
n
stra
t
e git
a
r
c
hive
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
merg
e
-tool docu
m
e
nt
a
tio
n
: describe custom
c
om
m
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
git-merg
e
tool docum
e
ntaiton: show too
l
names in t
y
pe
w
r
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
e
s B
a
iley
Ad
d
a very b
a
sic test script fo
r
g
i
t mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Teach git m
e
r
g
etool to use
c
ustom commands d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an internal vari
a
ble of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Tidy up g
i
t
mergetool's
b
ackup fil
e
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles Bailey
gitk: Fi
x
the Makefile to cope
with syst
e
ms
l
a
c
k
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
ar
l
es Bailey
R
emove ol
d
gene
r
ated f
i
les from
.
g
itignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Cha
r
les Bail
e
y
Fix git-inst
a
web break
a
ge on MacOS X due
t
o the li
m
i
ted
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix
clone n
o
t
t
o
i
gno
r
e dep
t
h
when per
f
orming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree