repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Makefile: set SHELL to value of SHELL_PATH
2008-07-23
Mikl
o
s Vajna
t7601: extend the 'merge picks
u
p the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s Vajna
builtin
-
mer
g
e
:
giv
e
a pro
p
er
erro
r
m
essage for invali
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
lo
s
Vajna
Teach 'git merge'
that
some me
r
ge
s
trat
e
g
i
es no l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
Add a new te
s
t for git-merge-r
e
sol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
los
Vajna
t6021: add a new test for git-mer
g
e
-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
make remove-da
s
he
s
: apply to
s
cripts and
pro
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Va
j
na
git-bis
e
ct: use da
s
h-less f
o
rm on git bisect
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007
-
h
ash-
o
bject
.
sh: use
q
uotes for the tes
t
de
s
cri
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
os
Vajna
t0001
-
init
.
sh: chan
g
e
c
onfus
i
ng di
r
e
c
t
o
ry name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos Vajna
Build in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Fix t7601-merge-pu
l
l-co
n
fig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
git-commit-tr
e
e: mak
e
it usable fr
o
m o
t
her built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Add n
e
w
t
e
st case
to ensure git-
m
erge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git: use git i
n
it i
n
stead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to-git: rew
r
ite "gi
t
-fro
t
z" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o-gi
t
: abort if the pr
o
ject di
r
ectory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
h
g
-to-git: a
v
oid r
a
ising a
s
tring
exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
I
NSTALL
:
Update section ab
o
ut git
-
frotz
for
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klos
V
ajna
Reti
r
e 'stupi
d
'
merge strateg
y
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Vaj
n
a
A
d
d new test case
to ens
u
r
e git-merge
r
educes
o
ctopu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test
to ensur
e
git-mer
g
e handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
Intro
d
uce get_oc
t
opus_merge_
b
ases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
gi
t
-fmt-mer
g
e-ms
g
: mak
e
it u
s
able from oth
e
r built
i
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move read_c
a
che_unmerged() to read-cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Add new test to
e
nsur
e
g
i
t-merge han
d
les pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
na
Move parse
-
opt
i
o
n
s's sk
i
p_prefix() to git-
c
omp
a
t-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move c
o
mmi
t
_l
i
st
_
count()
t
o commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
a
jna
Mov
e
sp
l
it_cmdline()
to
a
l
i
a
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
na
path
-
lis
t
document
a
t
i
o
n
:
document all functio
n
s and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s
V
ajna
run-command docume
n
tation: fix "memset(
)
" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
g
i
t
-read-tree:
docu
m
ent -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
A simple script to parse th
e
results from the t
e
stcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos
Vajn
a
git
-
r
ebase -i: mention the short comm
a
nd aliases
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klo
s
Vajn
a
Remove un
u
sed code in pars
e
_commit_buffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
Vajna
Strbu
f
d
o
cume
n
tation: docu
m
ent most func
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklo
s
Vajna
Revision wa
l
k
i
ng documentation: document mo
s
t import
a
nt
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vajna
CodingGuidelines: Add a note to a
v
oid assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge
:
e
x
c
lude unnecessary opti
o
ns
from OPTIONS_S
P
EC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajna
git-fast-im
p
ort: rename cmd_*() functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
IN
S
TALL: add a
note about GNU interact
i
v
e
tools ha
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
A
d
d tests for sendemail
.
cc
confi
g
u
ration varia
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
git-send-email: add
a new sendemail
.
cc c
o
n
f
iguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajna
git-format-patch: add
a
new f
o
r
m
a
t
.
cc conf
i
guration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos Vajna
gi
t
checko
u
t: add -t alias for --trac
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff
o
ptions documentation: refer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos V
a
jna
contri
b
/hooks:
add an
e
xample pre
-
auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
Documentation/h
o
oks
:
add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
g
i
t
-g
c
--a
u
to: add
pre-auto
-
gc
h
o
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Doc
u
m
entation/
g
i
t
-merge: documen
t
subt
r
ee strat
e
gy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
l
o
s
Va
j
na
git-gui: Up
d
a
t
ed Hung
a
rian trans
l
ation (e5fb
a
1
8)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
M
ikl
o
s Vajna
Update Hun
g
arian translati
o
n
.
10
0
% comp
l
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajn
a
Improv
e
t602
9
to check the rea
l
"subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
D
ocum
e
ntati
o
n/git svn log: add a note a
b
out tim
e
z
o
nes
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Va
j
na
D
o
c
ument
a
ti
o
n/git-filter-br
a
nch
:
add
a
n
ew msg-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
M
i
klos Vajna
git-clean: handle errors if re
m
oving fi
l
es
fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
l
os
Vajna
Documentation/git-stash: do
c
ument options
f
or g
i
t
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Vajna
git
c
lone -s
document
a
tion: force
a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Va
j
na
builtin-g
c
.
c:
g
ua
r
d config parser f
r
o
m
value=
N
ULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklo
s
V
ajna
git
rev-parse manpage: spellin
g
fi
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajn
a
git pull manpage: don't inclu
d
e -n
f
r
o
m
fetch-opt
i
ons
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
iklos Vaj
n
a
git
-
clone -
s
: docu
m
e
nt problems with git
gc --p
r
une
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
kl
o
s Vajna
Include rev
-
lis
t
o
ptions
in git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
l
s
-re
m
ote: add
-
t and -h
o
ptions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add
using merge subt
r
ee
How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
i
klo
s
V
a
jna
t/t7001: avoid unn
e
c
e
ssary ER
E
when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos
Vajna
git-s
h
-setup: document git_e
d
itor()
a
n
d
g
et_aut
h
or_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajn
a
eve
r
y
d
a
y
: replace 'prune'
and 'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
o
s
V
a
jna
Update
H
un
g
arian tran
s
l
ation
.
100% comp
l
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
I
n
c
l
ude diff options in
the g
i
t-log
m
anpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos
V
ajna
git-send-
e
mail: ad
d
a new sen
d
email
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos
V
ajna
git
s
tash: document
apply
'
s --
i
ndex switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundl
e
: fi
x
comman
d
l
i
ne examples in th
e
ma
n
p
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Va
j
na
Use
r
Manual
:
add a chapter for sub
m
odules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Va
j
na
Hungarian
translati
o
n of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mikl
o
s Vajn
a
gitw
e
b
:
new c
g
i
para
m
eter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mikl
o
s V
a
jn
a
g
i
tweb
:
pr
e
fer g
i
t_g
e
t_project_owner() over get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mik
l
os Vajna
Document -<n> f
o
r
g
it-
f
o
r
m
at-pat
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree