repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: get rid of virtual_id
2008-09-05
Miklos Va
j
na
merge-rec
u
rsive:
get ri
d
of virtua
l
_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Va
j
na
merge-recursive: move
cu
r
rent_{file,di
r
e
ctory}_
s
et
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajn
a
merge-recursive: move t
h
e
g
l
obal obuf to struct
merge_opt
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge
-
r
e
cursive: get
rid of t
h
e index_on
l
y global va
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
Vajna
merge-re
c
u
r
sive:
move
c
all_depth to struct merge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
kl
o
s Va
j
na
cherry-pick/r
e
vert:
ma
k
e direct internal call t
o
merg
e
_tree(
)
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
bui
l
tin-merge
:
avoid
r
un_command_
v
_opt()
f
or r
e
c
ursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
me
r
ge-r
e
cursive: intr
o
duce m
e
rg
e
_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
Split out merge_recur
s
i
ve
(
) to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos
V
ajna
M
akef
i
le: enable SNPRINTF_RETURNS_BOGUS for HP
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklo
s
V
ajna
Fix
'
g
i
t
h
elp hel
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
los
V
a
jna
t
9
30
0
: replace '!' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: documen
t
the pa
g
er
.
* configu
r
ation se
t
t
i
ng
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
i
klos Vajna
Builtin git-he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Vajna
builtin-help: a
l
ways load_com
m
and_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a second t
e
stcase for handling inval
i
d
strateg
i
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s V
a
jna
Add a new te
s
t for using
a custo
m
merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
uil
t
i
n-me
r
ge: allow using
a
cus
t
om strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
uiltin
-
help: make
s
ome inte
r
nal
f
un
c
tions avai
l
able
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend th
e
'
m
e
rge picks up
the best
re
s
ult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
Vajna
buil
t
in-me
r
g
e: give a proper
e
rror message f
o
r invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git me
r
g
e
'
t
hat som
e
merge
s
t
rategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a
n
e
w t
e
st for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
l
os
V
ajna
t
6
02
1
: add
a new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make r
e
mo
v
e-da
s
hes:
a
p
ply to
s
cripts
a
nd programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use dash-less for
m
on git
b
i
sect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos
V
ajna
t1007-hash-obj
e
ct
.
sh: use quot
e
s
for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
s
h
: change confusi
n
g dir
e
ctor
y
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jna
Build
i
n
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
Fix t7601-
m
e
r
ge-pu
l
l-confi
g
.
s
h
on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
git-c
o
mmit-tree: mak
e
it
u
sable from other
built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new
t
e
st case to ensure gi
t
-merge p
r
epen
d
s the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-
t
o-git: use
git init
instead
o
f
git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
l
o
s
Vajna
hg-to-gi
t
:
re
w
rite "g
i
t-fro
t
z" t
o
"g
i
t frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git:
a
b
ort if t
h
e pr
o
ject directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklo
s
Va
j
na
hg-
t
o-git
:
avoid raising a string
ex
c
ep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
INSTALL: Update sec
t
io
n
a
bou
t
git-frotz
for
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklo
s
Vajna
Retire
'
stupid'
merge s
t
r
ateg
y
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajn
a
Add new tes
t
case to ensure git-merg
e
r
educes octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Add
new test to ensure git
-
merge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduc
e
get_oct
o
p
us_merge_bas
e
s(
)
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
git-fmt-merge-msg: m
a
ke
it usable f
r
om other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos V
a
jna
Move read_cache_unmerged()
to re
a
d-c
a
che
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
n
ew t
e
s
t
to ensure git-merge handl
e
s
pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move par
s
e
-o
p
tions's
s
kip_
p
ref
i
x() to git-co
m
pat-u
t
i
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vaj
n
a
Move
c
ommit_list_co
u
nt() to
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
M
ove split_cmdline
(
) to
alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
pa
t
h
-list docu
m
entat
i
on:
d
oc
u
men
t
all function
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run
-
command documentation: f
i
x "memset()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A si
m
p
l
e
script to parse the results from the
testcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
git-rebase -i: mention the
shor
t
c
ommand aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
Rem
o
ve unused code in parse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos V
a
jna
Strbuf doc
u
m
e
n
tatio
n
: d
o
c
ume
n
t mos
t
funct
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
V
ajna
R
ev
i
s
i
o
n walking documentati
o
n: d
o
cumen
t
most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
C
odin
g
Guideli
n
es: Ad
d
a n
o
te to av
o
id assig
n
ments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
i
k
l
os
Vajna
git-me
r
g
e
:
exclude unnece
s
sary options from OPTION
S
_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s V
a
jna
git-f
a
st
-
i
mport: rename c
m
d_*
(
) functions to parse
_
*
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Va
j
na
INS
T
ALL:
ad
d
a
note a
b
out G
N
U interactive
t
ools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
Add tests for sendemail
.
cc c
o
nfiguratio
n
vari
a
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
g
it
-
send-e
m
ail:
a
dd
a new sende
m
ail
.
cc configuratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-patch
:
add
a new format
.
c
c
configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos
Vajna
git checkout
:
add -t
a
lias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vaj
n
a
diff op
t
i
ons
docum
e
ntat
i
o
n
: refer to
--diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
contrib/hooks: add an example pre-
a
u
t
o
-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajn
a
Docume
n
tation/h
o
oks: add pre-auto-
g
c h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
g
it-gc --auto: a
d
d
p
re-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
V
ajna
Docum
e
ntation/git-merge: document
s
u
btree strateg
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
ik
l
os Vajna
g
i
t-gui: Updated Hu
n
garian translati
o
n (
e
5f
b
a18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklo
s
Vajna
Up
d
ate Hun
g
arian translatio
n
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t602
9
to check the r
e
a
l
"s
u
btree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajn
a
Docum
e
ntation/git
svn log:
a
d
d
a
n
o
te about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklo
s
Vajna
Docu
m
entati
o
n/g
i
t
-
filter-bra
n
ch: add a new msg
-
filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
os
Vajna
git-clean: handle
e
r
rors if removing files
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Doc
u
mentation/git-stash: document optio
n
s
f
or git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s documentat
i
on: force a new
p
aragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Va
j
na
built
i
n-gc
.
c: gua
r
d con
f
ig
p
a
rser
from value=N
U
LL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
i
klos Vajna
git rev-parse manpage
:
spelling f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos V
a
jna
git
p
ull manp
a
ge: don't include -n from
fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s: document pr
o
blems with git
gc --p
r
une
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Inc
l
ude rev-l
i
st optio
n
s
i
n
git
-
log
m
a
n
page
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: add
-t
an
d
-h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajn
a
Add usin
g
merg
e
s
ubtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
Va
j
na
t/t7001:
avoi
d
un
n
ecess
a
ry ERE when using
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
i
k
l
os Vajna
git
-
s
h-setup: docu
m
ent git_editor(
)
and get_au
t
hor_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vajna
eve
r
yday: replace 'prune' and 're
p
ack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian translati
o
n
.
1
0
0
%
co
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
iklos Vajna
Include
diff o
p
tions in t
h
e git-log ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
i
k
l
os Vajna
git-se
n
d-email
:
add
a
new sende
m
ail
.
to configu
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
Vajna
git stash
:
document apply'
s
--i
n
dex switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundle: fix commandline
e
xamples i
n
t
he
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Ma
n
ual:
add
a
chapter fo
r
submod
u
les
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mi
k
los Vaj
n
a
Hunga
r
ian transla
t
ion of git-gu
i
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os
V
a
j
na
gi
t
we
b
: ne
w
c
g
i par
a
meter:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mikl
o
s Vajn
a
gitwe
b
:
p
r
efer git_get_proje
c
t_ow
n
er(
)
ov
e
r get_file
_
owne
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Document -<n> for git-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree