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
Merge branch 'jc/maint-reset-remove-unmerged-new' into maint
2008-10-14
Mi
k
los Vajn
a
Add
t
e
stcase to ensure merging a
n
ear
l
y
p
a
rt of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mi
k
l
o
s Vajna
test-lib
:
fix color re
s
et in
s
ay
_
color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Va
j
na
t750
1
: always u
s
e
test_cmp
i
nstead o
f
d
iff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jna
Makefile: a
d
d m
e
rge_recursive
.
h
to
L
IB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile:
enabl
e
SNPRINTF_RETUR
N
S
_
BOGUS
f
or HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajn
a
Fix 'git hel
p
h
elp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replace '!' with test_m
u
st_
f
a
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docume
n
tation:
d
ocu
m
ent
t
he
p
age
r
.
* configuration settin
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Vajna
t76
0
1: extend the
'merge picks u
p
the be
s
t
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos V
a
jna
builtin
-
mer
g
e: g
i
ve a proper
e
rror messa
g
e fo
r
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git me
r
ge' t
h
at s
o
me
m
erge
strate
g
ies
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a
new tes
t
for git-me
r
ge
-
r
esol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6
0
21: add a new test for git-merge-r
e
solv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
m
a
ke remove-d
a
shes
:
apply to s
c
r
ipts
a
n
d pro
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajn
a
git-b
i
sect: use dash-le
s
s for
m
on git bi
s
ect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash
-
object
.
s
h
: us
e
quotes for the test de
s
crip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t0001-init
.
sh:
c
hange confusing di
r
ec
t
ory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os V
a
jn
a
Build i
n
merg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
lo
s
V
a
j
n
a
Fix t7
6
01-merge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
g
i
t-c
o
mmit-
t
ree: make it usable f
r
om o
t
her built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Ad
d
new test case to ensure git-
m
erge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: use git init
inst
e
a
d of g
i
t init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg
-
to-git:
re
w
rit
e
"git-frotz"
t
o
"
g
it
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
l
o
s
Vajna
hg-to-git: abort
if the pro
j
ec
t
directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avo
i
d
raisin
g
a string excepti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INS
T
A
LL: Update se
c
ti
o
n about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mik
l
os V
a
jna
Retire
'stupid' mer
g
e strate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add ne
w
test
c
a
se to ensure git-mer
g
e
r
educes octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add new test to ensure git-merge handles m
o
r
e t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Introduce get
_
octopus
_
merge_bas
e
s
() in
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
gi
t
-f
m
t-merge-msg: ma
k
e
i
t
usable from oth
e
r b
u
iltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move read
_
c
a
che_unmerged()
to
r
ea
d
-ca
c
he
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s Vajna
Add new test
t
o ensure git-m
e
rge handle
s
p
ull
.
t
woh
e
a
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move parse-options's ski
p
_prefix()
t
o
g
i
t
-compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jn
a
Move com
m
i
t
_list
_
count() t
o
commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajn
a
Move sp
l
it_cmdline(
)
to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
iklos Vajna
path-li
s
t
documentation: document all fun
c
tions an
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos
Vajna
run-
c
omma
n
d
docum
e
ntatio
n
: fi
x
"memset()" pa
r
amete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Va
j
na
g
it-read-tr
e
e: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A
s
i
mp
l
e script to p
a
r
se
t
h
e results from
the
t
es
t
c
ases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
git-rebase -
i
:
ment
i
on th
e
short co
m
mand
a
liases
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
Remo
v
e unused co
d
e in parse_commit_buffer(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajn
a
S
t
r
b
u
f documentat
i
on
:
d
o
cument most fu
n
ctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Rev
i
sion wal
k
ing documentation: doc
u
ment most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s
V
a
jna
Cod
i
ngGuid
e
l
i
ne
s
: A
d
d a note to avo
i
d
a
ssign
m
e
n
ts inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
Vajna
git
-
merge: exclude unneces
s
a
r
y options from OPTIO
N
S_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mi
k
los Vajna
git-fast-impor
t
: rename cmd_*
(
) func
t
i
ons
to p
a
rse_
*
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
Vajna
INSTALL:
a
dd a note
about GNU
i
nteracti
v
e tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests for sendemai
l
.
cc c
o
nfigurati
o
n variab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
it-send-emai
l
:
add a new sendemail
.
c
c configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajn
a
git-format-pat
c
h: add a ne
w
for
m
a
t
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
g
i
t
c
heckout:
a
d
d
-
t al
i
as
fo
r
--track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
iklos V
a
j
na
d
iff options documentation: refer to
-
-diff-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
contrib/
h
o
o
ks: ad
d
an example pre-auto-g
c
h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Do
c
umentation/hooks: add pre-auto-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
git-gc --auto: add
pre-a
u
to
-
gc ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Va
j
na
Documentation
/
git-merg
e
: document subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
i
t-gui: Upd
a
ted Hungarian
t
ransla
t
io
n
(e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Va
j
n
a
Upda
t
e Hungarian translation
.
100% compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t6029 to
check th
e
real "
s
ubtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Docum
e
ntat
i
o
n/git sv
n
l
o
g:
add a n
o
t
e about
t
i
m
ezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos V
a
j
na
Documentation/git-f
i
lter-bra
n
c
h: ad
d
a
n
ew ms
g
-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: han
d
le errors
i
f remov
i
ng fil
e
s fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
i
klos Vajn
a
Documentatio
n
/git
-
stash:
document options
f
or git
s
t
a
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vaj
n
a
git clone
-
s
doc
u
me
n
ta
t
i
o
n: force a new pa
r
ag
r
aph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
los Vajna
bu
i
l
t
i
n-gc
.
c: guard config parser from value=
N
UL
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-parse manpage: spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklo
s
Vajna
gi
t
pull manpage: don't
i
nclude -n f
r
om f
e
tch-opt
i
ons
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
Vajn
a
git
-
clone -s:
docu
m
ent pr
o
ble
m
s
w
i
t
h
g
it gc
-
-prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vaj
n
a
I
n
clude rev-list options in git-log
m
anpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
ls
-
remote: ad
d
-
t
and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos
Vajna
Add
using merge sub
t
re
e
How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
i
k
los Va
j
na
t/
t
7001
:
avoi
d
unnecessary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Va
j
na
git-sh-setup:
d
ocument g
i
t_e
d
i
t
o
r(
)
and
get_author_id
e
nt_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
los Va
j
na
everyday: repl
a
ce 'prune' and 'r
e
pack' wit
h
'
g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian transla
t
ion
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajna
Include di
f
f option
s
in the git-log man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
gi
t
-send
-
email: add
a
new se
n
demail
.
to conf
i
guratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos Vajna
git stash
:
documen
t
apply's --index s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
Mikl
o
s Vajna
g
it-
b
undle:
fix co
m
mandline examples in
t
he manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos V
a
jna
User Manual: add a chapter
for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
V
a
j
na
H
u
n
g
a
ria
n
t
r
a
n
slation of
g
it-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
i
kl
o
s
V
ajna
gitweb: n
e
w cgi par
a
meter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklo
s
Vajna
g
itwe
b
: prefer git_get_
p
roje
c
t
_
o
w
ner() over get_file_own
e
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Doc
u
ment -<n
>
for
g
it-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree