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
remote: add a new 'origin' variable to the struct
2008-11-11
Mikl
o
s
Vajn
a
remo
t
e
:
add a
new 'origi
n
' variable to the struct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
I
mplement
git
remote rename
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update-ref --no-deref -d
:
handle the case when the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Mik
l
o
s Va
j
n
a
git bra
n
c
h
-m
:
forbid renaming o
f
a sy
m
ref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Vajna
Fix g
i
t upd
a
te
-
ref --n
o
-deref -d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
rena
m
e_ref(): handle the case when the reflog
of a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix
git branch -m f
o
r symref
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
pa
r
se-opt: migrate builtin-checkout-ind
e
x
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
Add testcase to ensure me
r
ging
a
n
e
arl
y
part of a branch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux
P
PC support to the pre-
a
u
t
o-gc exam
p
le hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Mikl
o
s Vajna
test-lib: fix color res
e
t in sa
y
_color(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos V
a
jna
Imple
m
ent git clo
n
e
-
v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
M
ik
l
os
Vajna
Cleanup i
n
sha1_f
i
le
.
c::ca
c
he_or_unpa
c
k_ent
r
y()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Mikl
o
s Vajna
builtin-commit: use reduce_heads() o
n
l
y
when appropriat
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klos Vajna
builtin-merg
e
:
refr
e
sh the
i
ndex befo
r
e
calling
a
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t7603: ad
d
new te
s
t
c
ases to ensure b
u
ilt
i
n-commit uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
b
uiltin-commit:
use commit_tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Va
j
n
a
commit_
t
ree():
add a n
e
w author parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
t75
0
1: alw
a
ys use
t
est_cmp inst
e
ad of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vaj
n
a
builtin
-
merg
e
: release the lockfi
l
e in try
_
merg
e
_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s V
a
j
na
me
r
ge-recursive:
g
et rid
o
f virtual_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Vajna
merge-r
e
cursive: move cu
r
r
en
t
_{
f
il
e
,di
r
e
c
tory}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
n
a
merge-re
c
ursive: move
t
h
e
g
lobal o
b
uf to struct me
r
ge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los
V
ajna
merge-
r
ecursive: get rid of the index_
o
nly g
l
o
b
al variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
Vajna
merge-
r
ecurs
i
v
e: move call_depth t
o
struct merge_option
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makef
i
le: add merge_recursive
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pi
c
k
/
rev
e
rt: make
direct internal
c
a
l
l to merg
e
_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
builtin-
m
erge: avoid run_
c
o
m
man
d
_v_o
p
t(
)
f
or recursiv
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recur
s
i
ve: int
r
oduce
m
erge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
S
p
lit
out merge_recursive() to
merg
e
-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los V
a
jna
Makefile:
e
n
a
b
le SNPRINT
F
_RETURNS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'g
i
t he
l
p help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t9300: replac
e
'!' with test_m
u
st_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajn
a
Docu
m
entation:
docu
m
ent
t
h
e
pager
.
* configurati
o
n setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
V
ajna
Builtin gi
t
-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos V
a
jna
builtin-hel
p
: always lo
a
d_command
_
li
s
t()
i
n
c
md_h
e
lp()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
V
a
jna
Add
a
second test
c
ase for handling
invalid stra
t
egies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a
new test for usin
g
a cus
t
o
m me
r
ge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-m
e
r
g
e: a
l
lo
w
us
i
ng a c
u
stom str
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos V
a
jna
built
i
n
-hel
p
: make some i
n
t
e
rna
l
functions av
a
i
l
able
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7
6
01: extend
t
he 'merge pick
s
up the
b
est resu
l
t
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
bui
l
tin-merge: gi
v
e a pro
p
er error message for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Vajna
Tea
c
h 'g
i
t m
e
rge' tha
t
som
e
m
erge
strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new t
e
st for
git-mer
g
e-resol
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add
a
new t
e
st fo
r
git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make re
m
ove-dashes: a
p
ply
to sc
r
ipts and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-bisect: use dash-l
e
s
s
f
o
rm
on git b
i
sect
log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
aj
n
a
t100
7
-hash-o
b
ject
.
s
h
:
use quotes
f
or the test des
c
ription
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: change conf
u
sing directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vajna
Buil
d
in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
V
a
jna
Fix t7
6
01-merg
e
-pull-co
n
fig
.
sh
on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
i
t-commit-tree: make it usable from
other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajn
a
Add
n
e
w test
c
ase to ensure
g
it-merge prepend
s
the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os
Vajna
hg-to
-
g
i
t: use git init instead of g
i
t i
n
it-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git: rewrite "gi
t
-frotz
"
to "git frotz
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-
t
o-git:
abort i
f
t
h
e p
r
oject directory is not
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
:
avoid raising a string excepti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jna
INSTALL: Update
s
ect
i
on about git-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klos Vajna
R
e
tire 'stupid' merge st
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add ne
w
test
case to
en
s
ure git
-
mer
g
e reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
e
w tes
t
t
o
ensure gi
t
-
m
erge hand
l
e
s mo
r
e
t
han
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Introduc
e
get_octopus_me
r
ge_bases() in co
m
mit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Va
j
na
g
it-fmt-merge-msg: mak
e
i
t
u
s
able from oth
e
r
b
u
iltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
M
o
ve read_cache_unmerged()
to read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
Add new
t
e
st to en
s
ure git-me
r
ge h
a
ndles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move parse-
o
ptions's
s
kip_prefix() to git-c
o
mpat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve com
m
it_l
i
st_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
sp
l
it_cm
d
line() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
path-li
s
t documen
t
ation: do
c
um
e
nt all fun
c
t
i
o
ns and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
j
n
a
run-command documentation:
fix
"
m
em
s
et()" par
a
meter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
git-read-tree: docum
e
nt -
v
o
p
ti
o
n
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
j
n
a
A simple
s
cript to parse the
result
s
fro
m
the testc
a
ses
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
V
a
jna
git-r
e
base -i: mention t
h
e short command al
i
ases
i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
o
s Vajna
Remov
e
unused code in pars
e
_commit_buffer
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos V
a
jna
S
t
rbuf do
c
u
m
entat
i
on: document most f
u
nctions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision wa
l
king documentation: docu
m
e
nt most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingGuid
e
l
ines: Add a
note to avoid assi
g
nments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los Vajn
a
git-merge: excl
u
de un
n
ecessary
op
t
ions
f
rom OPTI
O
NS_
S
PEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
M
i
k
l
os
Vajna
g
it-fast-
i
mport: r
e
nam
e
c
md_
*
()
f
unctions to parse_*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
a
j
na
I
NS
T
ALL
:
add a note ab
o
ut
G
NU in
t
e
ractive
tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
Add tests for sendemai
l
.
cc co
n
f
i
guration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-s
e
nd-email: add a new s
e
ndemail
.
cc con
f
igura
t
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-forma
t
-pa
t
ch: add a new form
a
t
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Va
j
na
gi
t
checkout: a
d
d
-t alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Va
j
na
diff options documentation:
r
e
fer to --di
f
f
-
filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
ik
l
o
s
Vajna
contrib/hooks: add
a
n example
p
re-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
Doc
u
mentation/h
o
oks: add
p
r
e
-auto-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vaj
n
a
git-g
c
-
-
a
u
to: a
d
d pre-auto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
D
o
c
um
e
ntation/git-merge: doc
u
ment
s
ub
t
r
ee strateg
y
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mikl
o
s Vajna
git-gui: Updated Hungarian translation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
os Vajna
Upd
a
te Hungarian
tr
a
nslation
.
100%
com
p
leted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Impro
v
e t6029
to
c
heck the real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
ikl
o
s Vajna
Documen
t
a
t
i
on/gi
t
svn log:
a
d
d a note abo
u
t
timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
iklo
s
Vaj
n
a
Documentation/git
-
filter-branch: add a n
e
w msg
-
f
i
lter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean
:
handle
errors if removing files fai
l
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
D
ocument
a
tion/git
-
stash: document options for gi
t
stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Vajn
a
g
it clone -s document
a
tion: fo
r
ce a
new paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Va
j
na
bui
l
tin-gc
.
c: guard config parse
r
from
value=NUL
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
i
klos Va
j
na
git rev-parse manpa
g
e
: sp
e
lling
fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
ajna
git pull manpage: don't include -n f
r
o
m fetch-o
p
tion
s
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next