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
M
i
k
l
os Vajn
a
builti
n
-commi
t
: use re
d
uce_h
e
a
ds
(
) only when appropr
i
ate
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: a
d
d new testcases to ensur
e
builtin-
c
ommit
u
ses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
o
s Vajna
builtin-commit: us
e
commit_
t
ree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos
Vajna
commi
t
_tree(): add a new author parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
t
7
5
01: always us
e
test
_
cmp instead
o
f
d
iff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
M
i
k
lo
s
V
a
j
n
a
builtin
-
merge:
r
elease the lockfile in try_
m
er
g
e_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-recur
s
iv
e
:
get rid o
f
v
irtual_i
d
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-r
e
cur
s
ive:
move current_{file,d
i
r
e
ctory}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-recursive:
m
o
v
e the global obuf to
s
truct merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
j
n
a
mer
g
e-
r
ecursive: get rid of the index_
o
nly global
v
ariable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Mik
l
os Vaj
n
a
merge-
r
ecursiv
e
:
mov
e
call_depth to struct merge
_
options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
Makefil
e
: add
m
erge_recursive
.
h to LIB
_
H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
c
herry-p
i
ck/reve
r
t:
mak
e
d
irect
inter
n
a
l
c
all to
m
erge_tre
e
()
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
builtin
-
merge: avoid r
u
n_co
m
mand_
v
_opt(
)
fo
r
recurs
i
ve
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
me
r
ge
-
recursive:
intr
o
duce me
r
ge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
S
p
l
i
t
o
u
t
merge_recu
r
sive()
t
o merg
e
-
recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile:
e
n
able SNPRINTF_R
E
TURNS_
B
O
G
U
S for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
l
o
s
V
ajna
Fix 'git help hel
p
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
ajna
t9300: replace '!'
w
ith t
e
st
_
m
u
s
t
_
f
a
il
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
l
o
s
Vajna
Docum
e
ntation:
d
ocument the
p
a
ger
.
* configuration setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
Vaj
n
a
B
uilt
i
n gi
t
-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
bui
l
tin-hel
p
:
alwa
y
s load_c
o
mman
d
_
l
i
s
t() in c
m
d_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s
V
ajna
Add a sec
o
nd testca
s
e f
o
r handling invalid
s
trategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add a new test for
using
a custom m
e
rge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
b
uiltin-merge: allow using a custom
s
t
r
ategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-help: make
s
ome i
n
tern
a
l functions availa
b
le
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
l
o
s Vajna
t7601: extend th
e
'merge
p
icks u
p
the be
s
t result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajn
a
b
uiltin
-
merge: give a proper erro
r
m
e
ssage for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajn
a
Te
a
ch 'g
i
t merge' that
some me
r
g
e
strategi
e
s no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
A
dd a new test
for git
-
merge-
r
eso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: a
d
d a new test for git-me
r
ge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
lo
s
Vajna
make rem
o
v
e
-dashes: app
l
y to scripts and pro
g
rams as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vaj
n
a
git-bisect
:
use dash-less form
o
n
git bisect l
o
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-obj
e
ct
.
sh: use quotes f
o
r the t
e
st description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
s
h:
change confusin
g
d
irectory nam
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Fix t7601-merge-pul
l
-config
.
s
h
on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
gi
t
-commit
-
t
r
ee: make it usa
b
le f
r
om other built
i
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add n
e
w test case to
e
nsure git
-
merg
e
pr
e
pends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os
V
aj
n
a
hg-
t
o-git: use git init instea
d
of git init
-
db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jna
hg-to
-
g
i
t: rewrit
e
"git-frotz
"
t
o
"git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-g
i
t
:
abort
i
f the
project dir
e
ctory
i
s not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git:
a
void raising a string exceptio
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
IN
S
TALL: Updat
e
section
a
bout g
i
t-frotz for
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
R
e
tire 'stupid' mer
g
e strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add new tes
t
case to ens
u
r
e
git-merge reduces octopu
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new test
to
ensure git-merge ha
n
d
les mor
e
t
h
an
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
In
t
roduce get_octopus_
m
er
g
e_bases() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
git-fmt-merge-msg
:
make it usable fro
m
o
t
her b
u
iltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move rea
d
_cache_unm
e
rged(
)
t
o read-cac
h
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd
n
ew
t
est
t
o ensure git-merge handles p
u
ll
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
Mo
v
e parse
-
options's sk
i
p_prefix() to gi
t
-compat-uti
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
M
ove comm
i
t_list_count() to
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajn
a
Move split_cmdline()
t
o
a
lias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los
Vajna
path-
l
ist
documentat
i
on:
do
c
ument all funct
i
ons
a
nd
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
ik
l
os Vajna
run-comm
a
nd documentation: fix "memset()
"
par
a
m
e
ter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-
r
e
a
d-
t
ree: doc
u
me
n
t -v opti
o
n
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
V
ajna
A
s
imple
s
c
ript t
o
par
s
e
t
he results fro
m
the test
c
ases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
g
i
t-rebase -i: mention
t
he short com
m
an
d
al
i
ases
i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
Remov
e
u
n
used code in pa
r
se_commit_buffe
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajna
S
trbuf documen
t
ation: document most functi
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos V
a
jna
R
evision wa
l
king
documentation: document most im
p
o
rtant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
Vajna
Coding
G
u
ideli
n
e
s: Add a note to avoi
d
assignmen
t
s
i
nside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mikl
o
s
Vajna
git-merge
:
exclude
u
nnec
e
ssar
y
options from
O
PTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
git-fast-import: re
n
ame cmd_*() functions t
o
par
s
e_
*
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
M
iklos Vajna
INSTALL: add a note about GNU in
t
era
c
tive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajn
a
A
dd tests for se
n
demail
.
c
c
configuration
variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vajna
git-send-
e
mail
:
add a new se
n
dema
i
l
.
cc
c
o
nfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
git-format-patch
:
a
d
d a new format
.
cc confi
g
urati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos Vajna
git
check
o
ut: add -t
alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
i
f
f options
d
o
cumenta
t
ion:
r
efer to --d
i
f
f-f
i
lter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
kl
o
s Vajna
c
ontrib/ho
o
ks: add an examp
l
e
pre-au
t
o-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
Documentat
i
on/hooks
:
add
p
re-auto-gc
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vaj
n
a
g
it-gc --a
u
to: add
pre-auto-gc h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Va
j
na
Documentation
/
g
i
t-mer
g
e: docume
n
t
s
ubtre
e
strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated Hunga
r
ian translati
o
n
(e5f
b
a18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
os Vaj
n
a
Update
Hungari
a
n tr
a
nslation
.
100% c
o
mpl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Vajna
I
m
pr
o
v
e t6029
to chec
k
the real "subtree"
c
ase
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajn
a
Do
c
u
m
e
ntat
i
on/gi
t
svn
l
og: a
d
d a note about
timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklo
s
Vaj
n
a
Documenta
t
ion/git-filter-
b
r
a
n
ch: add
a
new msg
-
filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: hand
l
e err
o
r
s if
removing fil
e
s
f
ails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Mik
l
os V
a
j
na
Doc
u
m
e
n
t
ation
/
git-sta
s
h:
d
ocument options for gi
t
stas
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
g
it
clone -s documentation: force a new parag
r
aph
for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
bui
l
tin-g
c
.
c: guard con
f
ig parser from value=NULL
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
Mik
l
os Vajna
git
pull manp
a
ge: don't include -n f
r
om fet
c
h
-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s: docu
m
ent problems with git gc -
-
prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
M
iklos Vajn
a
I
n
clude rev-list options
in git-log
m
anp
a
ge
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os Vajn
a
ls-r
e
m
o
te: add -t and -h option
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklo
s
Vajna
A
dd using merge su
b
tree
H
ow-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001:
a
void u
n
necessary ERE
w
h
en us
i
ng grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos
Vajna
git-sh
-
setup: document git_editor() and get_
a
uthor_ident_
f
ro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: rep
l
ace 'prune' an
d
'repack'
with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian t
r
anslation
.
100
%
c
om
p
l
eted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
Va
j
na
I
n
c
lud
e
diff
o
ptions i
n
the git-
l
og m
a
npage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-s
e
nd-email: add a n
e
w sendemai
l
.
to configurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Va
j
na
g
it
sta
s
h
:
document
apply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklo
s
V
ajna
git-bundle: fix commandlin
e
exampl
e
s i
n
the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Va
j
na
User Manual: ad
d
a chapter fo
r
submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
ikl
o
s Vajna
Hungarian transl
a
tion of git-gu
i
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next