repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-commit: use reduce_heads() only when appropriate
2008-10-03
Mik
l
o
s
Vajna
b
u
i
lti
n
-commit:
use reduc
e
_hea
d
s() only when a
p
prop
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
t7603: a
d
d new tes
t
case
s
to
e
nsure bu
i
ltin-c
o
mmit us
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
builtin
-
c
ommit: u
s
e commit_tr
e
e
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
co
m
mit_
t
re
e
(): add a new autho
r
p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
o
s
Vajna
t7501: always u
s
e test_c
m
p instead o
f
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
i
klos V
a
jna
builtin-
m
e
r
ge: r
e
lease the loc
k
file in try_me
r
ge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recu
r
siv
e
: get rid o
f
virtua
l
_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
n
a
merge-recursive: move current_{fi
l
e,d
i
rectory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos
Vajna
m
erg
e
-re
c
ur
s
i
v
e: mov
e
the
glo
b
al obuf
t
o struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
m
erge-recursive: get rid of
the index_only global v
a
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mik
l
o
s
Vaj
n
a
merge-re
c
u
r
sive: move call
_
depth to struct
m
erge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
k
los Vaj
n
a
Makefile: add merge_r
e
cursive
.
h to LI
B
_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s Vajna
c
herry-pick/reve
r
t
:
make direct i
n
ternal
call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
iklos
Vajna
buil
t
in-merge: avoid run_command_v
_
opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge
-
recursive: introduce merge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Spl
i
t out merge_recursiv
e
() to m
e
rge-recurs
i
ve
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vajna
Makefile: en
a
bl
e
SNPRINTF
_
RE
T
U
R
NS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajn
a
Fix 'git h
e
lp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Va
j
na
t9300: replace '!' with test_must_fai
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Va
j
na
Documentation: document the pager
.
*
co
n
f
i
g
u
r
a
t
i
on se
t
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vaj
n
a
Built
i
n
git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
built
i
n-help:
a
lways
load_comm
a
n
d
_lis
t
() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
n
a
Add a second te
s
tcas
e
for ha
n
dling i
n
valid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
A
d
d
a
new test for us
i
n
g a cus
t
om merge s
t
r
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
bui
l
tin-merge
:
al
l
ow usi
n
g a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
buil
t
in-help: make some interna
l
f
unc
t
ions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Vajna
t
7
601: ext
e
n
d
t
he '
m
erge picks up
the best result
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
k
l
o
s
Vajna
buil
t
in
-
merge: give a proper er
r
or mess
a
ge
f
o
r inva
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
each 'git me
r
ge' t
h
at some merge strategies no
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
Add
a
new test for g
i
t
-
merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos
V
a
j
na
t6
0
21: add a new t
e
st f
o
r git
-
merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove
-
d
ashes: apply to scripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git
-
b
is
e
ct: use d
a
sh
-
l
ess fo
r
m on git bise
c
t log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007
-
hash-object
.
s
h: use quotes for the test des
c
ri
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-ini
t
.
sh
:
cha
n
ge confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
u
ild in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix
t
7
601-merge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
git-
c
o
mmit-tre
e
: m
a
ke it usable
fr
o
m
o
ther builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Add new test
case to ensure git-mer
g
e
prepen
d
s
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
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
M
i
klos Vajna
h
g
-to-git: rew
r
ite
"git-f
r
o
tz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: abort if
the
p
roject d
i
re
c
t
ory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
jna
hg-to-git
:
av
o
id
raisi
n
g
a st
r
ing exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s
Vajna
INSTALL: Update section about git
-
frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Vajna
Ret
i
re
'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test ca
s
e to ensure git-m
e
rge reduce
s
octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
Add
new
t
est to
e
nsur
e
git-merge
handles more t
h
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os V
a
jna
Introdu
c
e
g
et_o
c
topus_me
r
ge_bases() in co
m
mit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Va
j
n
a
git-fmt-m
e
rge-msg: make it usa
b
le f
r
om other builti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
o
s Vajna
M
o
ve read_ca
c
he_unmerged(
)
to r
e
a
d
-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new tes
t
to ensure g
i
t-merge
h
andles
p
u
l
l
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
v
e
pa
r
se-options's skip_p
r
e
f
ix
(
)
to git-compat-ut
i
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move commit_list_coun
t
() to
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los
V
ajna
Move
split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s Vajna
p
a
th-
l
ist do
c
umentation: document all
f
u
nctions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
ru
n
-c
o
mmand doc
u
mentation
:
f
ix "me
m
set()
"
p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajn
a
git-rea
d
-tree: docume
n
t -
v
option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simpl
e
script
t
o parse the
re
s
ults f
r
om the tes
t
cases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
git-rebase -i: me
n
tion the
short co
m
mand aliase
s
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
Remove unused co
d
e
in p
a
rs
e
_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
klos Vajna
S
trbuf documentation: doc
u
ment most funct
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
klos Vaj
n
a
Revision walking documenta
t
ion
:
docume
n
t most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingGuidelines: Add
a
note to avoid assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Va
j
na
g
it-merg
e
: exclud
e
unnecessary opti
o
ns from OPTIONS_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
gi
t
-fast-import: renam
e
cmd_*() functions to pa
r
se_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL
:
a
d
d a n
o
te abou
t
GNU inter
a
ctiv
e
tools h
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add t
e
st
s
for
s
endemail
.
cc configura
t
io
n
vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-send-ema
i
l: add a new s
e
n
demail
.
c
c
c
onfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-
f
o
r
mat-patch: add
a
new for
m
at
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
Vajna
g
it
c
he
c
kout: add -t alia
s
for
--
t
rack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
Vajna
diff option
s
do
c
umentation: refer to
--dif
f
-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
o
s Vajna
c
o
n
t
rib/hooks: a
d
d an example pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
a
j
na
Docum
e
ntation/hoo
k
s: add pre
-
aut
o
-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc -
-
auto:
add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Docu
m
ent
a
tion/git-m
e
r
g
e: docume
n
t subtree s
t
rategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Va
j
na
git-gui: Updated H
u
ngarian
t
ranslation (e5f
b
a18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hu
n
gar
i
an tra
n
slat
i
o
n
.
10
0
% complete
d
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Vajna
I
m
p
rove t6029 to check the
r
eal "subtree" cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
ik
l
os Vajna
Documentat
i
on/g
i
t
svn
l
og: add a note about ti
m
ez
o
nes
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documenta
t
ion/git-filt
e
r-branch: ad
d
a new ms
g
-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklo
s
V
ajna
g
it
-
clean: handle errors i
f
removing files
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
ajna
D
o
cu
m
entation/git-stash: document optio
n
s for
g
it stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
g
it
c
lone -s doc
u
mentation
:
force a new paragra
p
h for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin
-
gc
.
c: guar
d
config pa
r
s
er from value
=
NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos
Vajna
git rev-parse manpage: spel
l
i
ng fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Va
j
na
git
pull manpag
e
: don't include
-n from fe
t
ch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clon
e
-s
:
d
o
c
ument
p
roblems with
g
it
g
c -
-
prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los Vajna
Includ
e
rev-list options
i
n
g
it-log
m
anpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
ls-remote:
add -t and
-
h
opt
i
ons
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
i
klos Vajna
A
d
d
using merge subtree
How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
i
klos
Vajna
t
/t7
0
0
1
:
avoid unne
c
essary
ERE whe
n
usin
g
gre
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-se
t
up: document git_e
d
itor() and get_au
t
h
o
r_ident_fr
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
ev
e
ryday: replace
'
prune' and 'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungari
a
n translation
.
1
0
0
%
c
o
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s
Vajna
Include dif
f
opt
i
ons in
th
e
git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
gi
t
-
s
end-email: add a
n
ew sendemail
.
t
o
conf
i
guration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git
s
tash: doc
u
ment appl
y
's --index switch
commit
|
commitdiff
|
tree
2007-09-29
M
iklo
s
Vajna
git-bundle: fix c
o
mmandline ex
a
mple
s
i
n
the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
iklos V
a
jna
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 Va
j
na
H
u
n
g
arian
t
ranslation of git-
g
u
i
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next