repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitweb: Use single implementation of export_ok check.
2008-11-01
M
i
klos Vajna
upda
t
e-ref
-
-no-deref -d: han
d
le the case when t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -m: forbid renaming
o
f a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
na
Fi
x
git update-ref --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
rename_
r
e
f
(): handle
t
he case
wh
e
n the r
e
flog
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos
V
ajna
Fix git
b
ranch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mi
k
los Vajna
p
arse-opt: migrate builtin-checkout
-
index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
Add
t
estcase to ensure mergi
n
g
an
e
arly part o
f
a b
r
a
n
c
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Va
j
na
Add Linux PPC s
u
ppo
r
t to the pre-auto-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklo
s
Vajna
test-
l
i
b
:
fix color reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Vajna
Implemen
t
git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup
i
n
s
ha1_file
.
c::
c
ach
e
_or_unp
a
ck_entry
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-commi
t
: use reduce_heads(
)
only when ap
p
ropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
b
uiltin-merge: refresh th
e
index before callin
g
a
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
t7603: a
d
d new testc
a
ses to
e
nsu
r
e bu
i
lti
n
-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
builtin-commit: use commit_tre
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree(
)
:
add
a new a
u
thor p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always use test_
c
m
p
ins
t
e
ad of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
i
klos Vajna
bu
i
ltin-
m
e
r
ge: r
e
lea
s
e the l
o
ckfile in try_me
r
ge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursive:
g
et rid o
f
virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los
V
a
jna
merge-r
e
cursiv
e
: move current_{f
i
l
e,directory}
_
set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
me
r
ge-recursi
v
e
: move
t
he g
l
obal o
b
uf to struct me
r
g
e
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Va
j
na
merge-recursive
:
g
e
t rid
o
f the in
d
ex_only
glob
a
l
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-re
c
u
r
s
ive:
move
c
all
_
d
epth to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s
Vajna
Makefile:
a
dd
merge_re
c
ursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
cherr
y
-pic
k
/
r
evert: mak
e
direc
t
i
n
t
ern
a
l
call to merg
e
_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los V
a
j
na
builtin-me
r
ge: avoid run_command_v
_
opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
merge-rec
u
rsive: introduce merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split
o
ut
m
erge_recursi
v
e() to merge-rec
u
rsive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Ma
k
e
f
i
le: enable S
N
PRIN
T
F
_
R
ETURNS_BOGUS for
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jn
a
Fix '
g
it help
h
elp
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos
V
ajna
t9300: r
e
p
l
ace
'!
'
with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los V
a
jna
Docum
e
nta
t
i
on: docu
m
ent the pa
g
er
.
* conf
i
guration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mi
k
los V
a
jna
B
u
i
lti
n
git-h
e
lp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
uiltin-help: always load_command_
l
ist() in cm
d
_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add
a
second testc
a
s
e for han
d
ling inva
l
id strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
Ad
d
a new tes
t
f
o
r using a custom merge strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-merge:
a
ll
o
w using a custom strat
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-he
l
p:
make
some
intern
a
l functions avail
a
ble
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos Vajna
t7601: extend
the '
m
e
r
ge pi
c
ks up
t
he best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin
-
merge: give a pr
o
p
e
r
error m
e
ssage
for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vajna
T
e
ach 'gi
t
merge' that s
o
me merge strategies
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los
Vajna
Add
a
n
ew test
for git-m
e
rge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vaj
n
a
t60
2
1: add
a
new test for
g
it-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
make remove-dashes: apply to scripts a
n
d
p
rogr
a
ms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: u
s
e
d
ash-less f
o
rm
o
n git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-
o
bject
.
sh
:
use
q
u
ot
e
s for
t
h
e test descrip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: change
confu
s
ing
directory n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vaj
n
a
Build in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
F
ix
t7601-
m
erge-pull-c
o
n
fig
.
sh on AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
git-com
m
it-tree: make
it usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case to ensur
e
g
i
t-m
e
rge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-gi
t
: use git in
i
t instead of git init-d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
it: rewri
t
e "git
-
frotz" to "g
i
t frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos V
a
jna
hg-
t
o-
g
it
:
abort if
the
projec
t
d
irectory
i
s
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
j
n
a
hg-to-git:
avoid
r
aising a strin
g
exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
ajna
INS
T
ALL: Update sect
i
on about
g
it-frotz f
o
rm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
V
ajna
Retire
'
stupid' merg
e
st
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add n
e
w test
case to ens
u
re g
i
t-mer
g
e reduces o
c
topus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new
t
est to e
n
sure git-merge han
d
les more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce
get_octopu
s
_merge_b
a
s
e
s()
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 usabl
e
from ot
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
M
ove read_cache_unmerge
d
() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
A
dd new test to e
n
su
r
e git-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-
o
ptions's skip_prefix() to git-co
m
pat
-
util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move commit_list_co
u
nt() t
o
c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vaj
n
a
Move split_cmdline
(
) to
a
lias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos
V
ajna
pat
h
-list documentation: document all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
ru
n
-
c
o
m
mand documentation
:
fix "memset()
"
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mik
l
os 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
ple script
t
o parse the r
e
sults from the
t
estcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos
V
a
j
n
a
git-rebase -i
:
men
t
ion
the short comm
a
n
d alias
e
s in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove un
u
sed co
d
e
in parse
_
commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
klos Vajna
Str
b
uf d
o
cume
n
tation: d
o
cume
n
t most functio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Mi
k
lo
s
Vaj
n
a
R
evision walkin
g
documentation: document most impo
r
tant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Va
j
n
a
CodingG
u
idel
i
n
es: Add
a
n
o
te to av
o
id a
s
si
g
n
m
ents in
s
ide
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-
m
e
r
ge: e
x
clude unnecess
a
ry options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
klos Vajn
a
git-
f
ast-import: re
n
am
e
cmd_*() functions t
o
parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vaj
n
a
I
NSTALL:
a
dd a note
a
bout
G
NU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
l
os Vajna
Add test
s
for sendemail
.
cc configuratio
n
v
ariable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
i
t-s
e
nd-email: add
a new sendema
i
l
.
c
c
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
g
i
t-fo
r
mat-patch: add a new format
.
cc
c
o
n
fi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
V
ajna
git che
c
kout:
a
dd -t al
i
as for --t
r
ack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
iklos Vaj
n
a
diff
o
p
tions do
c
umentat
i
on: refer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
lo
s
Va
j
na
c
o
n
t
rib/hooks: add
a
n example
pr
e
-au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klo
s
Vajna
Documentatio
n
/hooks: a
d
d
pr
e
-
a
uto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
o
s
Vaj
n
a
g
it-
g
c --aut
o
: add p
r
e-
a
uto-
g
c h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s Vajn
a
Documentation/git-merge: d
o
c
u
ment subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklo
s
Vajna
git-gui:
Updat
e
d Hungar
i
an tra
n
slation (e
5
fb
a
18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hunga
r
ian translation
.
1
00
%
c
o
mpleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Va
j
na
Imp
r
ove t6029 to check the real "s
u
btree" cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vaj
n
a
Documentat
i
on/git sv
n
log: add a
n
ote abo
u
t t
i
mezon
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
l
os Va
j
na
D
ocumentati
o
n/git-
f
ilter-branc
h
:
add
a
new msg-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git
-
c
l
e
an: ha
n
d
le
e
r
ror
s
if remov
i
ng files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Doc
u
mentation/
g
it-sta
s
h: docu
m
ent
o
ptions for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mik
l
o
s Vaj
n
a
git clone -s documentation: force a n
e
w parag
r
ap
h
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mik
l
o
s
Vajna
builtin-g
c
.
c
:
guard config parser fro
m
value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-pars
e
manpage:
s
p
e
llin
g
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-option
s
.
tx
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
g
it-clone -s
:
d
o
c
ument problems with g
i
t gc -
-
prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklo
s
V
a
jna
In
c
lud
e
rev-list
op
t
ions in git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next