repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ap/maint-apply-modefix' into maint
2009-01-03
M
iklos
V
a
jna
fast-expo
r
t: print usage when n
o
option
s
sp
e
cified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos V
a
jna
t9129: ski
p
the l
a
s
t three test
s
if
UTF-
8
loca
l
e is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mikl
o
s Vaj
n
a
Submitti
n
gPatches: men
t
ion the usage of
real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos V
a
jna
g
i
thooks doc
u
mentation: ad
d
a note
a
b
out the
+
x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon doc
u
men
t
ati
o
n
:
use
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-gui: Update Hunga
r
ian transl
a
t
ion for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos Va
j
na
h
t
tp
.
c:
us
e
'git_config_string' to
g
et '
c
url_http
_
proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
s
ubm
o
dule:
u
se git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
r
e
b
ase:
u
se
g
it rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos
Vajna
pull
:
use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
lo
s
t-found:
u
se git
r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
kl
o
s Vajna
fi
l
ter-br
a
nch: use git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vaj
n
a
git-stas
h
: use
g
it
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
V
ajna
User's Man
u
al: remove
duplicat
e
d url at the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
built
i
n_clone: use s
t
rb
u
f in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
built
i
n-clone: use strbuf
i
n
clone_local(
)
and copy_or_li
n
k_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajna
bu
i
ltin-clone: use strbuf in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos
V
ajna
Add new te
s
tcase to show fast-
e
xpo
r
t does
n
o
t alwa
y
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
b
u
iltin-branch:
u
s
e
strbuf in re
n
ame_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Va
j
na
built
i
n
-bra
n
ch:
us
e
str
b
uf in f
i
ll_
t
racking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builtin-
b
ranch: use
strb
u
f in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
Update
Hungarian tr
a
nslation
.
1
0
0% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
V
ajn
a
gi
t
-remote: docu
m
e
n
t the migration feature of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vaj
n
a
git
-
r
emote
r
e
n
a
me: mi
g
r
a
te f
r
o
m remotes/ and branc
h
e
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vaj
n
a
re
m
o
t
e: a
d
d a
n
ew 'origin' v
a
ri
a
ble
t
o
t
he struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mi
k
los
Vajna
Im
p
lement gi
t
remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
Vajna
update-
r
ef
--no-dere
f
-d: handle t
h
e case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mi
k
los Vaj
n
a
git branc
h
-
m
:
forbid rena
m
ing of a sym
r
ef
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git update-ref --no
-
de
r
ef -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
rename
_
ref(
)
: handle the case when the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
Fix
git branch -m
f
or symr
e
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mi
k
los Vajna
parse-opt: migrate bu
i
l
tin-c
h
ecko
u
t-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Va
j
na
Add tes
t
case to ens
u
re merging
a
n ea
r
ly part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
Vajn
a
A
d
d
L
i
nux PP
C
support to the pr
e
-auto-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mi
k
los Vajn
a
test-li
b
:
fix
color rese
t
in say
_
color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
I
m
ple
m
e
n
t
git cl
o
ne -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in sha
1
_file
.
c::cache_or_un
p
a
ck_entry
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-comm
i
t: use r
e
duce_heads
(
) only when
a
ppropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-
m
erge: refresh the index before
c
a
lling a
str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t
7
603: add ne
w
testcases to
e
nsure b
u
i
ltin-co
m
m
i
t
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use
c
ommit_t
r
ee()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree(
)
:
add a n
e
w au
t
h
o
r parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
t75
0
1
: always use t
e
st_cmp
i
n
s
t
ead
of di
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin-merge: relea
s
e the lo
c
kfile in try_merge_str
a
tegy
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recursive: get
rid of v
i
rtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-recursive:
mo
v
e current_{file,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos
Vajna
merg
e
-recursiv
e
: move the gl
o
bal obuf to struct mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
ikl
o
s
Vaj
n
a
merg
e
-recursiv
e
: get rid of
the index_only global va
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
me
r
ge
-
recursive: move call_depth
t
o struct merge
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os
Vajna
Makefile: add merge_
r
ecursive
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
c
herry-pick/revert: make direct intern
a
l
c
a
ll to
merge_tr
e
e
()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avoid run_command_v_opt() fo
r
recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
erge-re
c
ursiv
e
:
introd
u
ce merge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
Split out merge_re
c
ursive() to me
r
ge
-
recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Va
j
na
Makefile
:
enable
S
NPRINTF_RETURNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os Vajna
t9300: repl
a
ce '!' wit
h
tes
t
_must_fa
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
iklos Va
j
na
D
o
cume
n
tation: document the pager
.
* configura
t
ion set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vaj
n
a
Builtin g
i
t
-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
iltin-help: alway
s
load_command_list() i
n
cmd_hel
p
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
ikl
o
s
V
ajna
Add
a
second testcase for handling inval
i
d s
t
rategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
V
a
jn
a
Add a new test fo
r
using a custom merg
e
str
a
teg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os V
a
jna
builtin-m
e
rge: allo
w
using
a custom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Va
j
na
builtin-help: make
some internal functions
a
v
ailable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: exte
n
d
the 'merge picks up
t
he be
s
t result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mik
l
os Vajna
bu
i
ltin-
m
erg
e
:
g
i
v
e a
p
roper err
o
r me
s
sage for inv
a
li
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge' tha
t
some merg
e
strate
g
i
e
s no
long
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos
V
a
j
na
Add
a
new test for git-me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
t60
2
1
:
add a new
t
est for gi
t
-merg
e
-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make
r
e
mo
v
e-
d
ashes:
a
pply
t
o
scripts
a
nd programs
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: us
e
dash-less form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-object
.
sh: use quotes
for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajn
a
t
0
001-init
.
sh:
c
hange
confusing
d
ir
e
ctory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bui
l
d in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
Fix t7601-merge
-
pul
l
-
config
.
sh
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Va
j
na
git-commit-tr
e
e: make it
u
sable from
o
ther
b
uiltin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Ad
d
new
t
est case to ensu
r
e g
i
t-mer
g
e p
r
epe
n
ds the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-to
-
gi
t
: use git in
i
t inst
e
ad of gi
t
i
n
i
t-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg-to
-
gi
t
:
re
w
rite "g
i
t-frot
z
"
to "git frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
h
g-
t
o-
g
i
t
:
abort if the project d
i
rectory
i
s
no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
l
o
s Vajna
hg-to-git: avoid
r
aising
a
str
i
ng exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos
V
ajna
INST
A
LL: Updat
e
section about git-f
r
ot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos V
a
jna
Retir
e
's
t
upid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new t
e
st
c
ase t
o
ensure git-merge redu
c
es
octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew test
t
o ensu
r
e git-
m
erge handles more t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
In
t
rod
u
c
e
ge
t
_octopus_
m
e
r
ge_ba
s
es() in
c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
g
i
t
-
fmt-merge-msg: make it usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajna
Move read_cache_unmerged() to
r
ead-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new
test to ensure git-merge handle
s
pull
.
twohea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-op
t
io
n
s's
skip_prefix
(
) to git-compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajna
Move commit_l
i
st_cou
n
t() to
c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move
s
plit_c
m
dlin
e
() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
pa
t
h-list documentation: do
c
ument all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
u
n-c
o
m
m
and documen
t
ation: fix "mems
e
t()
"
par
a
me
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mikl
o
s
Vajna
git-r
e
ad-
t
ree: document -v opti
o
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
A sim
p
le
sc
r
ip
t
to parse the results from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
g
i
t-rebase -i: mention the short co
m
mand aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
o
s
Vajna
Remove unused code in p
a
rse_commit_buffe
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Mik
l
o
s
Vajn
a
Strbuf doc
u
mentatio
n
: document most fun
c
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos V
a
jna
Revision walking document
a
tion: docum
e
nt most impor
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next