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
provide more errors for the "merge into empty head" case
2008-08-17
Miklos Vajna
t
9300
:
rep
l
ace '!' wi
t
h
t
est_
m
us
t
_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
ocumentation:
d
ocument th
e
pager
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vaj
n
a
t7601:
exte
n
d the
'merge
picks up t
h
e best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
ik
l
o
s Vaj
n
a
builtin-merge
:
give
a p
r
o
per e
r
ror me
s
sag
e
for in
v
alid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Va
j
na
Te
a
ch 'git
merge' th
a
t some mer
g
e s
t
r
ate
g
i
e
s no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
Add a new test for git
-
me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajna
t6021: add
a
new test for git-merge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
m
a
ke r
e
mo
v
e
-dashes: ap
p
ly
t
o scri
p
ts and p
r
ograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use das
h
-less fo
r
m on
g
it bise
c
t log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t1007-hash-object
.
sh: use quo
t
es for the test descriptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t0001-init
.
sh: ch
a
nge confusing
d
irectory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
F
ix t7601-merge-pull-conf
i
g
.
s
h o
n
AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
git-c
o
m
mit-tree: make it usable fro
m
other b
u
iltin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajn
a
A
dd
n
e
w test case
t
o e
n
sure gi
t
-merge pre
p
e
n
ds th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
h
g-t
o
-
git
:
u
s
e git init instead o
f
git i
n
it-d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg
-
to-git: rewrite
"
git-frotz" to "git
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg
-
to-git: abo
r
t
if the pro
j
ect d
i
rectory
i
s not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
h
g-to
-
git: avo
i
d raising a st
r
ing
e
xception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
INS
T
A
LL: Update section abo
u
t
g
it
-
frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mik
l
os Va
j
na
Retire 'stu
p
id'
m
erge s
t
r
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add n
e
w t
e
st case to ensu
r
e
g
i
t-
m
erge reduces octop
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
A
d
d ne
w
t
e
st t
o
en
s
u
re git-merge handles
m
o
r
e than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introd
u
ce
get_o
c
topus_
m
erge_bas
e
s
() in
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
git-fmt-merg
e
-msg:
m
ake it usable from ot
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
V
a
jna
Move read_cache_unmer
g
ed() to read-
c
ach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
ajna
A
dd new test t
o
ensure git-me
r
ge
h
a
ndles p
u
ll
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move pa
r
se-option
s
's skip_pr
e
fix()
to
g
it-compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
j
na
Move commit_list_count
(
) to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move s
p
lit_
c
m
dli
n
e() to ali
a
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajn
a
p
a
th-list
d
ocument
a
tion: docu
m
e
n
t all
f
u
nctions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
u
n
-c
o
mmand docu
m
ent
a
tion: fix "m
e
mset
(
)" parame
t
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
iklos Vajna
git-read-
t
ree
:
d
ocument -v o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple script to
parse the
r
esults
from the
testcas
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git
-
rebase -i
:
me
n
tion
t
he sh
o
rt command
a
l
i
ases
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos
Vajn
a
Remove unused code in parse_comm
i
t_buffe
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
Vajna
Strbuf do
c
umen
t
ati
o
n:
doc
u
ment most
fun
c
t
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos V
a
jna
Revision walking doc
u
m
entation: document most imp
o
r
ta
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los Vaj
n
a
CodingG
u
idel
i
nes: A
d
d a n
o
te to avo
i
d
a
ssignme
n
ts ins
i
de
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos Vajna
git
-
m
e
rge:
ex
c
l
u
d
e unn
e
c
essary options from OPT
I
ONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import: rename cmd_*() functions to
parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
i
klos
V
ajn
a
INSTALL: a
d
d a note abou
t
GNU
interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
los Vajna
Add tests for send
e
mail
.
cc configu
r
ation v
a
ri
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
git-send-email: add a new
sen
d
email
.
cc config
u
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
git-format-p
a
tch: add
a new
format
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
k
l
os Vajna
git checkout: add -
t
alias for
-
-track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os V
a
jna
d
iff options
docume
n
t
a
ti
o
n:
r
efer to --diff-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
con
t
rib/hooks: ad
d
an exam
p
le pre-
a
uto-
g
c hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
ik
l
os Vajna
Documen
t
a
t
ion/hoo
k
s: ad
d
pre-
a
uto-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc --auto
:
add pre-au
t
o-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
iklos V
a
jna
Do
c
um
e
n
t
ation
/
gi
t
-merge: document s
u
btree
s
tra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gu
i
: Upd
a
ted Hu
n
ga
r
ian trans
l
ation
(
e
5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
aj
n
a
Up
d
at
e
H
u
ngarian
translat
i
o
n
.
10
0
%
c
o
mple
t
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Mikl
o
s
V
ajna
Improv
e
t6029 to
c
heck the real
"
subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
Vajn
a
Documenta
t
ion
/
git s
v
n
log: add
a not
e
about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mik
l
o
s
Va
j
na
D
o
cumentation
/
git-filter-branch:
ad
d
a new
m
sg-filte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
os Vajna
git-clean: handle errors if
r
e
m
oving files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s
V
aj
n
a
Docu
m
en
t
ati
o
n/git-stash: documen
t
options
f
or git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s documen
t
atio
n
:
f
orce a new para
g
raph
f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-gc
.
c: guard config parser f
r
om
value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajn
a
git rev-parse manpage: s
p
elling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
g
it pull manpage: don't include -n from fet
c
h
-op
t
ions
.
t
x
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s:
d
oc
u
m
e
nt problems with
git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
k
los Vajna
I
nclude rev-l
i
s
t
opti
o
ns
i
n gi
t
-log m
a
npage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
Vajna
ls
-
remote:
add -t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
i
k
lo
s
V
a
jna
Ad
d
using merge
s
ubtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/
t
7
0
01: av
o
i
d unnecessary
E
RE when using
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
los Vajna
git-sh-setup
:
do
c
ument git_editor
(
) and g
e
t_aut
h
or_ident_
f
ro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajn
a
everyday: replace 'pru
n
e' a
n
d 'repack
'
with 'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungari
a
n
t
ranslation
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Va
j
na
In
c
lude dif
f
options in the git-lo
g
m
a
npag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mi
k
lo
s
Vajna
g
i
t-send-email: add a
new send
e
mail
.
to co
n
f
i
gu
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s Vajna
git
s
tash: docu
m
ent appl
y
'
s --index switc
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vaj
n
a
git-bundle:
f
ix commandline examp
l
es i
n
th
e
manpag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
k
l
os
Vajna
User M
a
n
ua
l
: add
a
chapter f
o
r
submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
H
u
ngaria
n
tr
a
n
s
lation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mikl
o
s Vajna
gitweb: ne
w
cgi parame
t
er: op
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
g
i
t
w
eb: pref
e
r git_g
e
t_pr
o
ject_owner()
over get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Document -<n> for git-f
o
rma
t
-
p
atch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree