repo.or.cz
/
git
/
jnareb-git.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-1.6.1' into maint-1.6.2
2009-06-21
M
i
kl
o
s
Vajna
g
it-sv
n
docume
n
tation: fix typo in 'reba
s
e vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mikl
o
s Vajna
gittuto
r
ial: remove misleading n
o
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
Ma
k
e
t
3
4
1
1 executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-
e
xp
o
rt:
p
rint u
s
age w
h
en no option
s
specifie
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos
V
ajna
parse-
o
pt:
migra
t
e
builti
n
-ap
p
ly
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajn
a
t9129: skip the la
s
t three tests if UT
F
-8
l
ocale
i
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vaj
n
a
Sub
m
ittin
g
P
a
tches: m
e
ntion the usag
e
of r
e
a
l
name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s Vaj
n
a
githooks documenta
t
ion: add a n
o
te ab
o
ut t
h
e
+x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon docume
n
tation: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add support for a pdf version
of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos Va
j
n
a
git-g
u
i:
Update
H
u
n
garian translation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c: u
s
e '
g
it_c
o
nfig_string' t
o
get '
c
url
_
h
t
tp_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule: use git rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Va
j
na
pull: use git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
lost-f
o
und: use gi
t
rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
filt
e
r-bra
n
ch
:
use git re
v
-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash: u
s
e git rev
-
parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
V
ajna
User's M
a
nua
l
: remove dup
l
icated
url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
a
j
n
a
builtin
_
cl
o
ne: use
strbuf
in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builti
n
-clone: use strbuf
in clon
e
_local() and copy_o
r
_li
n
k_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klos
Vajna
b
uiltin-clo
n
e:
u
se strbuf in g
u
ess_dir_
n
ame(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Va
j
na
Add new
testcas
e
to show fast-exp
o
rt d
o
es not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
u
iltin-b
r
anch: use str
b
uf in
rename_bra
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
bui
l
tin-branch: use strbuf in fil
l
_
trac
k
ing_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vajna
builti
n
-
b
ranch: use strbuf in
delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
Update Hungarian transl
a
tion
.
100% c
o
mpleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
gi
t
-
remote:
d
ocument t
h
e
migratio
n
featu
r
e of t
h
e rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklo
s
Vajna
git-remo
t
e
re
n
ame: mi
g
r
a
te from remotes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vaj
n
a
r
e
mot
e
:
a
dd a
n
ew 'origin' variable to the
struc
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mik
l
os
V
ajna
I
m
p
l
ement git r
e
mot
e
rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajn
a
update-ref --n
o
-deref -d: ha
n
dle the case
when
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
i
k
l
os
V
a
jna
git branch -m:
forbid r
e
naming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklo
s
Vajna
Fix git upd
a
te-ref
-
-no-deref
-d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_re
f
(): handle the case when t
h
e r
e
f
l
og
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
Fi
x
git
b
ranch
-
m for symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
M
iklos Vaj
n
a
pa
r
se-opt:
m
igrate builti
n
-chec
k
out-i
n
dex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcase to ensure mer
g
ing an
e
arly part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos Vajna
Add Linux PPC suppo
r
t to the pre-auto-gc
example
h
o
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
V
ajna
test
-
lib: fi
x
color reset in say_
c
ol
o
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mi
k
l
o
s Vajna
Implement
git clone -
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
o
s Vaj
n
a
Cleanup in sha1_file
.
c:
:
ca
c
he_or
_
unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os Vaj
n
a
builtin-commit: use red
u
ce_heads()
o
nl
y
when ap
p
ro
p
riate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
ajna
builtin-merge: refresh the index be
f
ore c
a
lling
a
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
t76
0
3: add
n
ew testcases
to ensure b
u
iltin-
c
ommit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
builtin-com
m
it
:
u
s
e commit_tree(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
a
j
n
a
commit
_
tree(): add a n
e
w
a
uth
o
r paramete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501:
a
l
w
a
y
s
use
t
e
st_cmp instead of
d
iff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
iklos Vajna
builtin-merg
e
: re
l
e
a
s
e the lockfi
l
e in
t
ry_me
r
ge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive
:
get rid of
virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
mer
g
e-recursive: mo
v
e
current_{file,d
i
rectory}_
s
et
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Va
j
na
merge-rec
u
rs
i
ve: mov
e
the global
obu
f
t
o
stru
c
t merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: get r
i
d of the index_only g
l
obal vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merg
e
-r
e
cursive: move
c
a
l
l_depth to
s
t
ruct merge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
Ma
k
e
file:
a
dd
merge
_
recursive
.
h to LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos V
a
jna
ch
e
rry-pick/rev
e
rt:
m
a
ke direct intern
a
l call to mer
g
e_tre
e
(
)
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajn
a
builtin-
m
e
r
ge: av
o
id run_c
o
mmand_v_opt()
for recursi
v
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
me
r
ge-recursive: introduce merge_op
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
Split out m
e
r
ge_recursive()
t
o me
r
ge-
r
ecursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vaj
n
a
Makefile: enable SNP
R
INTF_RETURNS_BOGUS
for HP-U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos Vajna
Fix 'git help he
l
p'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
iklos V
a
jna
t9300: repl
a
c
e
'!'
with
test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vaj
n
a
Docu
m
entation: doc
u
men
t
the pager
.
*
confi
g
uration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os
Vajna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos V
a
jna
built
i
n-help:
always load
_
command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a secon
d
testcase
f
or hand
l
ing inv
a
lid stra
t
egies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
j
na
Add a
n
ew test for using a custom m
e
rge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
built
i
n
-
m
erge:
allow using a
c
ustom
stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
built
i
n
-
help: m
a
ke some
i
nte
r
nal f
u
n
c
tions availab
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos Vajna
t7601: ext
e
n
d
t
he
'
merge picks u
p
the bes
t
r
e
s
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
ik
l
o
s V
a
jna
bu
i
l
t
in-
m
erge:
g
ive a
p
roper e
r
ror m
e
s
s
age for in
v
al
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
V
a
jna
Te
a
ch '
g
it m
e
rge' that
some merge strategies no lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klo
s
Vajna
Ad
d
a
new test for git-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6
021
:
add a new test for git-
m
erge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
m
ake
remove-
d
a
shes: ap
p
ly to scripts
a
nd programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
i
t-b
i
sect
:
use da
s
h-less form o
n
git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Va
j
n
a
t
10
0
7-hash-o
b
ject
.
s
h
:
use quot
e
s for th
e
t
e
st descript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: chan
g
e
confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klo
s
Vajna
Build in
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
Vajna
Fix t7
6
0
1-mer
g
e-
p
ull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os Vajna
gi
t
-commit-tree: make
it usa
b
le f
r
o
m othe
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Add new test case to ensur
e
git-merg
e
p
repends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
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
Miklos Vajna
hg-to-git:
r
ewrite "g
i
t
-frotz" to "git
f
ro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to
-
g
i
t
: abort i
f
the p
r
oject director
y
is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg-to-g
i
t: avoid rais
i
ng a string exce
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajn
a
INSTALL: Update section abo
u
t git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klos Vaj
n
a
R
e
tire 'st
u
pid' me
r
ge
strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new
t
es
t
case
to ensure git-me
r
ge
r
educes
o
cto
p
us
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
A
d
d new test
t
o ensure gi
t
-
m
e
r
ge handles
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
In
t
roduce
get_octopus_merge
_
ba
s
e
s
() in comm
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-fmt-me
r
g
e-msg: make it usa
b
le from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cache_unmerge
d
() to re
a
d-ca
c
he
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
s
t
t
o
ensu
r
e g
i
t-
m
erge
h
andles p
u
ll
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajna
Move parse
-
options's sk
i
p_prefix() t
o
gi
t
-compat
-
util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajn
a
Move
c
o
m
mit_list_cou
n
t() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
Move split_c
m
d
l
i
ne() t
o
ali
a
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
ajna
path-lis
t
d
o
cumenta
t
ion: d
o
c
u
ment all
fu
n
ct
i
on
s
an
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
j
n
a
run-command docume
n
tat
i
on: fix "memset
(
)" p
a
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-
t
ree: d
o
cument -v
option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next