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 'maint'
2008-11-01
Miklos
Vaj
n
a
upda
t
e-ref --no
-
deref
-
d: handle the
c
a
se when t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklo
s
Vajna
git
br
a
nch -m: forbid renaming
o
f a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os
V
ajna
Fix git upd
a
te-ref --no-de
r
ef
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
na
r
e
n
ame_ref(): handle the cas
e
when t
h
e
reflog
of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s
Vajna
Fi
x
git branch -m fo
r
symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklo
s
Vajna
pars
e
-opt: migrate builtin-checkout-i
n
d
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajn
a
A
dd testcase to ensure me
r
g
i
ng an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux PPC support to the
pre-auto-g
c
ex
a
mple
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-l
i
b:
f
ix
co
l
or re
s
et
i
n say_c
o
lor()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Vajna
Implemen
t
git clon
e
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanu
p
in sha1_file
.
c::cache_or_un
p
ack_e
n
tr
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos V
a
j
n
a
builtin-commit: use reduce_heads() only when appropriat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos Vaj
n
a
builti
n
-merge
:
refresh the in
d
ex befo
r
e ca
l
lin
g
a
st
r
a
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
t7603: ad
d
new te
s
tca
s
e
s
to ensure bu
i
l
t
i
n-comm
i
t uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-c
o
mmit: use
c
ommit_tre
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree
(
): add a n
e
w author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
j
na
t7501: alwa
y
s
use t
e
st_cmp i
n
st
e
ad of
d
iff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos V
a
jna
builtin-merge: release t
h
e lo
c
k
f
ile in
try_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
jna
merge-recursive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
o
s
Vajna
merge-r
e
c
u
rsive: move curren
t
_
{
file,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
r
ge-r
e
cursive: move the
global
obuf to
struct m
e
rge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
lo
s
Vajna
merge-recursiv
e
: get rid of the index_only global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s Vajna
me
r
ge
-
recursive: m
o
ve c
a
ll_depth to
struct merge
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Ma
k
efile: add merge_recursive
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
c
herry-pi
c
k/revert: make direct in
t
ernal
call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin
-
merge: avoid run_comman
d
_v_o
p
t
(
) for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recur
s
ive: i
n
tr
o
duc
e
m
er
g
e_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Sp
l
it out merge_recursi
v
e() t
o
m
e
rge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Make
f
ile:
enable SNPRINTF_
R
ETURNS_BOGUS
f
or HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vajna
F
ix 'git he
l
p
help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
ajna
t
9
300: replace '!' with
t
e
s
t_must_fa
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Va
j
na
Doc
u
mentat
i
on: document
t
he pager
.
* confi
g
uratio
n
setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Va
j
na
B
u
i
ltin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Vajna
builtin-h
e
l
p
: alway
s
l
oad_
c
omma
n
d_list() in cmd_help(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
Add a
s
econ
d
testcase for
handling
invalid
s
trategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
A
dd a new te
s
t for using a custom mer
g
e
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builti
n
-merge: allow using
a cus
t
om
s
tr
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-
h
e
l
p: mak
e
some int
e
rnal functions avai
l
abl
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: exten
d
the 'merge picks up t
h
e bes
t
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
buil
t
in-merge
:
give a
proper
e
r
ror mes
s
age
for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vajna
Teach 'git merg
e
' that some merge strategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
l
o
s V
a
jna
Add a
n
e
w tes
t
for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new
test
for git
-
me
r
g
e-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
ma
k
e remove-dashes: apply to scripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
git-bisect: use dash-less
form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos
V
ajna
t1007-hash-object
.
s
h
: use
q
uo
t
es f
o
r the test descript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t0001
-
ini
t
.
s
h: change
c
on
f
using directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-merge-pull-
c
onf
i
g
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
n
a
git-commit-tree: make
it usable f
r
om other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add
new tes
t
c
ase to ens
u
re git-me
r
ge prepe
n
ds
th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os V
a
j
n
a
hg-to-git: use git init inste
a
d
o
f
g
it i
n
it-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-git: rewri
t
e "g
i
t-frotz" to "g
i
t
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-
t
o-git: abort if th
e
p
r
o
ject directory is not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
it: avoid
raising a string exceptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
INS
T
ALL: Update section
a
b
out git-frotz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Va
j
na
Retire '
s
tupid' merge st
r
ate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
Add new test case to en
s
ure
git
-
merge
r
e
d
uces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajn
a
A
d
d new test to
en
s
ure gi
t
-merge h
a
n
dles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s
Vaj
n
a
Introduce get_
o
c
t
opus_merge
_
bases(
)
in com
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make it us
a
ble from other
b
uiltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move rea
d
_cache_
u
nm
e
rged() to
r
ead-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
A
dd n
e
w
t
est
to en
s
ure git-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move pa
r
se-opti
o
ns'
s
skip
_
prefix(
)
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
unt() to
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
M
o
ve split_cmdli
n
e() to
alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajn
a
p
ath
-
list doc
u
mentation:
d
ocu
m
ent all funct
i
on
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
ru
n
-comman
d
do
c
umentation: fix "
m
emset()" pa
r
ame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
iklos Vajna
g
i
t-rea
d
-tree: do
c
ume
n
t -v op
t
ion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple
s
c
ript to parse the results from t
h
e test
c
a
ses
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
git-
r
eba
s
e -i:
m
e
n
tion the short
c
o
m
m
and a
l
iases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
Remove unused
c
o
de
i
n
p
a
r
se_commit
_
buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
ajna
S
trbuf documentation
:
do
c
um
e
n
t most funct
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
V
aj
n
a
Revis
i
on walking docu
m
e
n
tat
i
on:
d
ocum
e
nt most
impo
r
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos V
a
jna
CodingGuidelines: A
d
d a no
t
e to a
v
oid assignme
n
ts inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
i
klos Vajna
git-merge: exclude
u
n
n
ecess
a
ry options fr
o
m OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import: rename cmd_*()
f
u
ncti
o
ns to
p
arse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
ajna
INST
A
LL:
add a note about GNU
i
nteractive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
j
na
Add tests
for sendemail
.
cc configuration var
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-se
n
d-ema
i
l:
add a new sendem
a
i
l
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-forma
t
-patch: add a new forma
t
.
cc
conf
i
gu
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checko
u
t:
add -t al
i
a
s
fo
r
--track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
dif
f
op
t
ions
d
oc
u
mentation: re
f
er
to -
-
diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
cont
r
ib/hooks: add a
n
example pre-auto-
g
c hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
V
a
jna
Docume
n
ta
t
ion/hooks: add pr
e
-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
g
i
t-gc --auto:
a
d
d
p
re-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mik
l
o
s V
a
jna
Doc
u
menta
t
ion/gi
t
-merge: document subt
r
ee stra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Va
j
na
g
i
t-gu
i
: Updated Hungari
a
n translation (e5fb
a
18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
M
i
klos Vajna
Up
d
ate Hungarian translation
.
10
0
% co
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improv
e
t6029 to ch
e
c
k
t
h
e
real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklo
s
V
a
jna
Documentation/git s
v
n log:
add a no
t
e about t
i
m
ezone
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Docu
m
entatio
n
/g
i
t-f
i
lter-br
a
n
c
h
: add a new msg-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vaj
n
a
git-clean:
h
andle err
o
rs
i
f
removin
g
files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s Vajna
Documentati
o
n/git
-
stash: docum
e
nt
options
f
or git sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s d
o
cumenta
t
i
o
n
:
f
orce a ne
w
para
g
raph
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
b
u
i
l
tin
-
gc
.
c: g
u
ard co
n
fig
parser from v
a
lue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
ajna
git rev-parse manpage:
spel
l
ing
fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpage: don't include
-n from fetch-
o
ptions
.
t
xt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mikl
o
s V
a
jna
git-clone -s: doc
u
ment pro
b
lem
s
with git gc
--prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
V
ajna
I
nclude rev
-
l
i
st options in git-log
m
a
npa
g
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next