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
git-compat-util: suppress unavoidable Apple-specific deprecation warnings
2014-10-15
Charles Bailey
d
i
fftoo
l
: don't assume that default s
h
is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
merget
o
ol: don
'
t require a work tree for --tool
-
h
elp
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Bailey
Fix
c
ontrib/subtree Makefi
l
e to
p
atch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles B
a
iley
filter-branch: e
l
iminate duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charl
e
s
B
ailey
c
o
m
pat
/
bswap
.
h: det
e
ct endiann
e
ss on mor
e
platf
o
rms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bai
l
e
y
t
e
s
ts: don't
r
ely on strerror text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
r
les Bailey
dir
.
c: make git_fnmatch()
n
ot inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Char
l
e
s
B
ailey
m
ergeto
o
l
: Remove explicit
r
efe
r
enc
e
s to
/d
e
v/
t
ty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Baile
y
st
a
sh tests: stash can lose data in a file remo
v
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
Baile
y
stash: Don't o
v
er
w
rite files
t
h
a
t
h
av
e
gone from th
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Do
c
um
e
ntation:
D
e
scribe other
situations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bai
l
e
y
Change
xdl_mer
g
e to generate output e
v
en for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Ba
i
le
y
t6023: merge-file
fails to
out
p
ut anything
for a degen
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: fix run
n
ing m
e
rgetool in sub-dire
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
merg
e
t
o
o
l: Add
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
B
a
iley
merge
t
ool: respect autocrlf by using checkou
t
-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don't keep
tem
p
or
a
ry merge
files
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Bailey
merge
t
ool: Add prompt to continue afte
r
faili
n
g
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles B
a
i
ley
Add
-y/-
-
no-prompt option
t
o merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix
s
ome t
a
b
/
space in
c
onsistencies
i
n git-mergetoo
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charle
s
Bailey
git-a
r
c
hive: w
o
r
k in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive re
s
pe
c
t
core
.
autocr
l
f when creati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arle
s
Bailey
Add new test
t
o de
m
o
nstrate
git archive
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
mer
g
e-
t
ool documentation: desc
r
ibe custo
m
command us
a
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
gi
t
-mergetool
documentaiton:
s
how tooln
a
me
s
in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Ba
i
ley
Add a
v
ery basi
c
test sc
r
ipt for
gi
t
merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
r
les Bai
l
ey
Tea
c
h gi
t
mergetool to
use cus
t
om commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Chang
e
d an internal variable of mergetool t
o
suppo
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy
up git merget
o
ol's backup file
b
e
h
aviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
harles
B
a
iley
gitk: Fix the Makefile
t
o cope with
systems lacki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
e
move old ge
n
erated
file
s
from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
Fix git-ins
t
aweb bre
a
kage on MacOS X due
t
o the limi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fi
x
c
lone not to ignore depth when performi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree