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
Add mksnpath which allows you to specify the output buffer
2008-10-14
M
i
klos Vajna
Add
t
est
c
ase to ensure merging an ear
l
y part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos V
a
jna
test-l
i
b: fix co
l
or reset
i
n sa
y
_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
ikl
o
s Vajna
t7501: alw
a
ys use test_cmp instead
of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
Makefile: add merge_recursive
.
h to LI
B
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Va
j
n
a
Makefi
l
e: enable
SNPRINTF_RETURNS
_
BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vaj
n
a
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos V
a
jna
t9300: re
p
lace '!' with test_mu
s
t_fai
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
ocumen
t
ati
o
n
:
docu
m
ent the pa
g
e
r
.
* c
o
nfiguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajn
a
t7601: extend the 'merge
picks up the
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
bui
l
tin-merge: give a proper err
o
r messa
g
e for i
n
v
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge' th
a
t s
o
me mer
g
e str
a
t
egie
s
n
o
lo
n
ge
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
d
d a new test for git-me
r
ge
-
r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new
test for
git-m
e
rge-
r
eso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
make remove-dashes:
a
pply to s
c
ri
p
ts and progr
a
ms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
gi
t
-bisect: use dash-less form
o
n git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t1007-ha
s
h-
o
bject
.
sh:
use quotes for the t
e
st descri
p
ti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: c
h
a
n
ge
con
f
usi
n
g directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
Vajna
B
uil
d
in m
e
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Fix t7601-me
r
ge-pull-co
n
fi
g
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
gi
t
-co
m
mit-tr
e
e
:
m
ake it
usa
b
le f
r
o
m oth
e
r
b
uiltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add n
e
w test case to ensure git
-
me
r
g
e prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s
V
ajna
hg-to-git:
use git init instead o
f
git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git
:
rewr
i
te "
g
it-
f
rotz"
t
o "git fr
o
t
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
:
abo
r
t if t
h
e
projec
t
directo
r
y is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Va
j
na
hg
-
to-git: avoid raisi
n
g a string excep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
INSTALL: Upd
a
te section abo
u
t git-frotz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos V
a
j
n
a
R
e
tire 's
t
upid' merge str
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new tes
t
case t
o
e
n
sure g
i
t-
m
erge r
e
d
uces octopu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to e
n
sure git-merg
e
handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Introduce ge
t
_
o
ctopus_me
r
ge_bases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s Vajn
a
g
i
t-fmt-me
r
ge-msg: make i
t
us
a
ble fro
m
o
t
her builtin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move read
_
ca
c
he_unmerged() to
r
e
a
d
-
cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
V
ajna
Add new
t
est to
e
nsure git-merg
e
handles pull
.
two
h
ead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
M
ov
e
p
arse-options's skip_prefi
x
(
) to git-compat-
u
til
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_
c
o
u
nt() t
o
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
M
ove split_cm
d
line() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
path-list do
c
u
m
ent
a
tion:
d
o
cume
n
t all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documentation: fix "mems
e
t()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
iklo
s
Vajna
git-re
a
d-tree:
do
c
ument -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple script to parse the result
s
f
r
om the
t
estcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s V
a
jna
git-reb
a
se -i: mention
the short co
m
mand al
i
ases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
Remove u
n
u
sed
cod
e
in p
a
rse_commit
_
buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklo
s
Va
j
na
Strbuf do
c
u
m
entati
o
n: document most functio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision
walking documentatio
n
: do
c
ument most impo
r
ta
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los
V
ajna
CodingGuidelines: Ad
d
a note to avoid
a
s
sig
n
me
n
ts insi
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mikl
o
s Vajna
gi
t
-merge:
exclude un
n
e
cessary options fr
o
m OPTION
S
_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-
i
mport: rename
c
m
d_*(
)
functions to pa
r
s
e
_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
Vajna
INSTALL: add a not
e
about GNU interactive too
l
s has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
Add tests for sendemail
.
c
c configu
r
ati
o
n variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-
s
end
-
e
mail: add
a
new sendemail
.
cc
c
onfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
g
it-f
o
rmat
-
pa
t
c
h
: a
d
d
a new form
a
t
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
k
los V
a
jna
git checkout: add
-t
alias for -
-
t
rack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vaj
n
a
d
i
f
f
options docume
n
tatio
n
: refer to -
-
diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
o
s
Vajna
contri
b
/
h
oo
k
s
: add an example pr
e
-
auto-
g
c h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documen
t
ation/hooks: add pre-auto
-
g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
git-gc --auto
:
add pre
-
auto-gc ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Docu
m
e
nt
a
tion/git-merge: docume
n
t subtree strateg
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Vajna
git-gui: Updated Hungari
a
n
tran
s
lation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Updat
e
Hun
g
a
r
i
a
n
transla
t
ion
.
100
%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Va
j
na
Improve t6029 to check the real "subtree
"
cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos V
a
jna
Do
c
umentati
o
n/git svn log: add a
n
o
te about time
z
ones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklo
s
Va
j
n
a
Do
c
umentation/git-filter-br
a
nch: a
d
d a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
los Vajna
g
i
t-clean: han
d
le er
r
ors i
f
r
e
mo
v
i
n
g files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
ik
l
os Vajna
Docu
m
e
ntatio
n
/
g
it
-
s
t
a
sh: do
c
ument options for
git
s
t
a
sh
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
ikl
o
s Va
j
na
g
i
t clone -s
docu
m
entation: force a new
paragraph f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklos Vajn
a
builtin-gc
.
c: gu
a
r
d
config parser from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklo
s
Vajna
git r
e
v-par
s
e manpage: sp
e
ll
i
ng fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
Vajna
g
i
t pull m
a
npage
:
d
on'
t
in
c
lude -n fro
m
f
e
tch-
o
ptions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vaj
n
a
g
i
t-clone -s: doc
u
ment problems with g
i
t
g
c -
-
prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
Va
j
na
Include rev-list options in gi
t
-log manpa
g
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
r
e
mote:
a
dd
-
t a
n
d -h
o
ptions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Ad
d
usin
g
m
er
g
e subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
iklos
V
ajna
t/t70
0
1
: avoid unnecessary
E
RE when using g
r
ep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mik
l
os V
a
j
n
a
gi
t
-sh-setup: document g
i
t_editor() and get_author_ide
n
t_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyd
a
y
:
replace
'
prune' and 'repack' w
i
th 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian
translation
.
100%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos V
a
jna
Include diff
o
pti
o
ns i
n
t
h
e
g
it-log man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos
Vaj
n
a
git-s
e
nd-e
m
ail
:
a
dd a ne
w
sendemail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s
V
ajna
git stash: do
c
umen
t
apply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
M
i
klos V
a
jna
git-b
u
ndle: fix com
m
and
l
ine
e
xam
p
les in the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Va
j
na
U
s
e
r Manual:
add a chapter for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian translation of
git-
g
ui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitweb:
n
ew
c
gi paramete
r
: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vaj
n
a
g
itweb: p
r
e
f
er
g
i
t
_
get_project_owner()
o
ver get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklo
s
Vajna
Document -<n>
f
or
g
i
t
-fo
r
mat-pa
t
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree