repo.or.cz
/
git
/
gitweb-caching.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: fix and clarify grammar in git-merge docs.
2008-01-09
Johannes Sixt
recv_sideband: Do not use ANSI esc
a
pe se
q
u
ence on dumb
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-18
Johannes S
i
xt
filter
-
branch: Re
m
o
v
e broken an
d
unnecessary summary
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-18
Johannes Sixt
Cl
e
an up
doc
u
m
e
ntatio
n
that
r
eferences depreca
t
ed
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-18
Johannes Sixt
Plug a re
s
ource leak in threaded pack-obj
e
cts code
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-17
Johanne
s
Sixt
thread
e
d pack-objects: Use
c
ondition variables for
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-14
Jo
h
annes Sixt
git-gui: Mo
v
e
f
r
equ
e
ntly used co
m
mands t
o
the top of
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-11
Johannes Sixt
Fix a
t
y
po in ch
e
c
k
out
.
sh and c
l
eanup one-
l
i
n
e h
e
l
p
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-06
Johannes Sixt
for-each-
r
ef:
Fix quotin
g
sty
l
e constants
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-03
Joh
a
nn
e
s Si
x
t
git-co
m
m
i
t: Al
l
o
w to am
e
n
d a merge com
m
it
t
h
a
t
does
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-12-03
Johan
n
es Sixt
git-gui: Improve t
h
e application i
c
on on Windows
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-30
Johannes Sixt
t7003-fil
t
er-br
a
nch:
Fix
t
es
t
of a f
a
iling --
m
sg-filter
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-20
Johann
e
s
Sixt
F
lush progre
s
s messa
g
e b
u
f
f
e
r in di
s
play()
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-18
Jo
h
ann
e
s Sixt
fet
c
h
-
pack: Prepar
e
f
o
r
a
side-band demultiplexer in
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-16
Johannes Si
x
t
refs
.
c:
R
e
move unused get_
r
ef_sha
1
()
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Joha
n
nes Sixt
Allow ETC_GI
T
CONFIG
t
o be a relativ
e
path
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Joh
a
nne
s
Si
x
t
Introduce git_etc_
g
itconf
i
g() that encapsulates acc
e
ss
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
J
o
hannes Sixt
Allow a rela
t
iv
e
builtin
templ
a
t
e
direct
o
ry
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Johannes Sixt
built
i
n
run_
c
ommand:
do not ex
i
t
w
i
t
h -1
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Johan
n
es Six
t
Move #i
n
clude
<
sys/selec
t
.
h> and <sys/ioct
l
.
h
>
to git
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Johannes
S
i
x
t
U
se
i
s_absolute_path()
in sha1_file
.
c
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Johannes Sixt
Sk
i
p t
3
902-quo
t
ed
.
sh if th
e
f
i
le s
y
stem does not su
p
p
o
rt
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Johanne
s
Sixt
t5302-pack-ind
e
x: Skip te
s
ts of 64-bit offsets if necessa
r
y
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Jo
h
annes
Sixt
t7501-commit
.
sh: Not all seds
u
nderstand o
p
tion -i
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-14
Johannes Sixt
t5300-pack-object
.
sh:
Split the big ve
r
ify-pack test
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-13
Johannes Sixt
Fix preproces
s
or logic
t
h
at determi
n
es the availablity
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-13
Johannes Sixt
gi
t
-clean: Fix e
r
ror messag
e
if
clean
.
requireForce
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-06
Johan
n
es Sixt
Give git-am
back the
a
bility to add S
i
g
n
ed-off-by lines
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-06
J
ohannes
Sixt
uploa
d
-pa
c
k
: Use finish_
{
command,async}()
ins
t
ead
of
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-11-04
J
o
h
annes Sixt
Fix an infin
i
te l
o
op
in sq_quote
_
buf()
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes Sixt
U
s
e
t
he as
y
ncr
o
nous func
t
i
on infrastructure to run
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes S
i
xt
Avoid a dup
2
(
2
) i
n
app
l
y_filt
e
r()
- start_com
m
and(
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes
Sixt
t
0
021-co
n
version
.
sh
:
Test that the clean filter really
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes Sixt
uplo
a
d-pack: Run
r
e
v
-l
i
st in an a
s
ynchronous function
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johan
n
es
Sixt
upload-pack: Move the rev
i
s
ion
walker into a se
p
a
rate
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johanne
s
S
ixt
Use
t
he asyncronous
function
i
nfr
a
structure in builtin
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
J
o
hannes
S
ixt
Add infrastructure
t
o run
a
function a
s
ynchronous
l
y
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes Si
x
t
upl
o
a
d
-pack:
U
se start_command() to run pack-objects
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes Sixt
Have start_
c
ommand(
)
create a pipe to read
t
he stderr
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
J
o
hanne
s
Sixt
Use start
_
comand() in builtin-fetch-pack
.
c ins
t
ead
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes
S
ix
t
Us
e
r
un_comma
n
d() to spawn external
diff
p
r
o
grams
i
ns
t
ead
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Joh
a
nnes
S
i
xt
Use st
a
rt_comman
d
() to run
content
f
ilters instead
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes S
i
xt
Us
e
s
t
art_co
m
mand()
in git_conn
e
ct() instead of explicit
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-21
Johannes Sixt
Change g
i
t_connect()
t
o retu
r
n
a struct child_
p
roce
s
s
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-20
J
o
h
anne
s
Sixt
gitk:
D
o
n
o
t
p
i
c
k u
p
file names of "c
o
py from" lines
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-10-12
Johannes Sixt
git-gu
i
: Change main
win
d
o
w layout
t
o
support
wider
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-09-26
Johanne
s
Sixt
gitattributes
.
txt: Be
m
or
e
to the
point in the f
i
lter
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-09-26
Jo
h
annes S
i
xt
gitat
t
ri
b
utes
.
txt: Remove a
d
uplicat
e
d paragraph about
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-09-01
Johannes Si
x
t
reba
s
e -m: Fix incorrect sho
r
t-logs of already
applied
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-08-17
Jo
h
a
n
nes Sixt
[PA
T
CH]
git
k
:
H
andle
'cop
y
from' and 'copy to' in diff
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-07-05
Johannes Sixt
Allow
r
ebas
e
to run if u
p
str
e
am
i
s
completely
m
erged
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-07-04
Johannes
S
i
x
t
f
i
lter-bra
n
ch docum
e
ntat
i
on: so
m
e mo
r
e touch
-
ups
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-07-04
J
o
h
annes
S
ixt
f
i
l
ter-
b
ranch: Avoid an er
r
or
messag
e
in the m
a
p function
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-07-03
Johannes
S
i
xt
Te
s
t 'git
a
dd' for unmerged
e
ntries whe
n
c
ore
.
symlinks
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-13
J
o
h
annes Sixt
git-remote s
h
ow
:
Also shor
t
en non-fast-forwar
d
r
efs
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-12
Joh
a
nnes Sixt
Remove traili
n
g sl
a
sh from $
(
tem
p
late_
d
ir
)
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-12
Johanne
s
Sixt
Avoid double
-
s
l
ash
in path names that depend on $(sharedir)
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-09
Johannes Sixt
f
i
l
t
er-bran
c
h
:
subd
i
rectory filt
e
r
needs --full-hi
s
tory
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-09
Johannes Sixt
f
ilter-branch: Simplify parent
c
ompu
t
ation
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
Johann
e
s Sixt
Acc
e
pt dates before 2000/01/01 when sp
e
cified
a
s
seconds
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
Joha
n
nes Six
t
Makefile: Remove git-mer
g
e-
b
ase from PROGRAMS
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
J
ohannes Sixt
filter-branc
h
: also do
n
't fai
l
in map
(
) if a commi
t
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-06-06
Johanne
s
Sixt
fil
t
er-b
r
a
n
c
h
: Use re
v
-list a
r
g
u
m
e
n
t
s to spe
c
ify
r
evision
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-05-08
Johannes Sixt
g
i
t-gui: Call changes "Staged"
a
nd "Unstaged" in file
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-20
J
ohannes Si
x
t
Teach git-remote to list pus
h
e
d branches
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-04
Johan
n
es Si
x
t
Tell
m
ulti-parent diff
a
bout c
o
re
.
symlinks
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-04
Jo
h
annes Si
x
t
Handle core
.
symlinks=false case in me
r
ge-recursive
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-03-03
Joh
a
nnes Sixt
Add cor
e
.
symli
n
ks to mark
filesystems that do n
o
t support
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2007-01-30
J
o
hannes Sixt
A
dd a missing f
o
r
k() erro
r
c
h
eck
.
commit
|
commitdiff
|
tree
2006-11-13
Joha
n
n
es S
i
xt
Catch err
o
rs
when writing an
index that
c
o
n
t
ains
inva
l
i
d
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2006-11-13
Jo
h
annes Sixt
t
e
s
t-lib
.
sh
:
A
comman
d
d
y
i
ng due t
o
a sig
n
al is an
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree