repo.or.cz
/
git
/
gitbuild.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move current_{file,directory}_set to struct merge_options
2008-09-05
Mi
k
l
o
s
Vajna
merge-rec
u
rsive: move curre
n
t_{file,
d
irectory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
m
erge-recursive: move the g
l
o
b
al o
b
u
f
to struct mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
V
a
jn
a
m
e
rge-recursive: ge
t
rid of the index_only global var
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s
Va
j
n
a
m
e
r
g
e
-recursive: move call_d
e
pt
h
to st
r
u
c
t
merg
e
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
cherry-pick/re
v
ert:
make
d
irect int
e
rnal cal
l
to me
r
ge_t
r
ee()
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
builtin-merge: avoid r
u
n_command_v_opt() for r
e
cursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
me
r
ge-
r
ecursive: introduce merge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
lo
s
V
a
j
na
Split out merge_recu
r
sive
(
) to merge
-
recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
akefile
:
e
n
able
SNPRINTF_RETURNS_BOGUS for HP-U
X
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
Miklos
V
ajna
t
9300:
r
eplace '!
'
wit
h
test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: document th
e
pager
.
*
configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s Vaj
n
a
Builtin
g
it-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos
V
ajna
builti
n
-h
e
lp:
always
l
oad_command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
Add a seco
n
d
te
s
tcase
f
or handling invalid str
a
t
e
gies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s Vajn
a
Add a
new test for
u
sing a custom mer
g
e s
t
rateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
V
ajna
bui
l
t
i
n-m
e
rge: a
l
low us
i
ng
a
custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
bui
l
tin-help: make some intern
a
l
functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
Vajna
t7601: extend
the 'merge picks up
t
h
e
best re
s
ult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Va
j
na
builtin-merge
:
give a proper e
r
ror
m
essage fo
r
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os V
a
jna
T
e
ach
'
gi
t
merge'
t
hat some
m
erge
str
a
t
e
gies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
Add a new
t
est for g
i
t-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6021: add a new test for
g
it-merge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
make remov
e
-dashes
:
a
pply to scripts an
d
p
r
ograms a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajn
a
git-bi
s
ect: use dash-less form on git
b
isect
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t1007-hash-ob
j
e
ct
.
sh: use quotes
f
or the test d
e
s
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t0001-
i
n
it
.
sh
:
chang
e
confusi
n
g
d
irectory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vaj
n
a
Bui
l
d
in m
e
rg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix
t7601-merge-pull-config
.
sh on AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
g
it-commit-tree
:
make it usa
b
le from other
b
ui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
V
a
jna
Add new test case to ensure git
-
merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajn
a
hg-t
o
-g
i
t: u
s
e git
init in
s
te
a
d
o
f git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
lo
s
Vajna
hg-to-git: rewrite "g
i
t-frotz" to "git fro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
h
g
-to-git: a
b
o
r
t
if th
e
p
r
oject dire
c
tory is
n
ot
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avoid raising a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
IN
S
T
A
LL:
Update section
a
bou
t
git
-
frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mikl
o
s Vajna
Reti
r
e 'stupid
'
merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
st case to ensur
e
gi
t
-merge
r
e
d
uces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos V
a
jna
Ad
d
new test
to
e
nsure gi
t
-
m
erge
h
andles more
t
ha
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_o
c
topus_m
e
r
g
e_
b
ases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-
f
m
t
-
m
erge-
m
sg: make it usable
from other
b
uil
t
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move read_
c
ache_unmerged(
)
to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test t
o
ensu
r
e
g
it-merge
h
and
l
es pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
M
ove pa
r
se-o
p
t
i
ons's skip_prefix() to git-compat
-
u
til
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
M
o
ve commit_list_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move
s
p
l
it_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajna
pat
h
-list docum
e
ntation: docu
m
ent all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
iklos Vajna
run-
c
o
mman
d
documentation
:
fix "me
m
set()"
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: docum
e
nt
-
v op
t
ion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple
script to parse the result
s
from th
e
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
git-rebase -
i
: me
n
tion the sho
r
t comm
a
n
d
a
liases
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused code in
p
arse_co
m
mit_bu
f
fer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf do
c
umentation:
d
ocument m
o
st fun
c
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision walking
d
ocumentation
:
d
ocument
m
os
t
imp
o
rtant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
o
s
Va
j
na
C
odingGuidelines: Add a note
to avoid assignm
e
nts in
s
ide
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajn
a
git
-
m
e
rge: ex
c
l
ude unneces
s
a
ry opt
i
ons
f
r
o
m OPTIONS_SPE
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import: re
n
ame cmd_*(
)
f
u
n
c
t
ions to par
s
e_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos V
a
jna
INSTALL:
ad
d
a note about GNU
i
nteractive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
kl
o
s Vajna
Add tests for
s
endemail
.
cc configur
a
tion v
a
riabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
git-sen
d
-e
m
ail:
add
a
new sen
d
email
.
cc co
n
fig
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-fo
r
mat-patch: add a new f
o
rmat
.
cc configuratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos
V
ajna
git che
c
kout: add -t alias for --
t
ra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklo
s
Vajna
diff options documentation
:
r
efer to --diff-filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
ontrib/hooks:
add a
n
e
x
amp
l
e
p
re-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klo
s
V
a
j
na
Do
c
umentati
o
n/hooks: add
p
re-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vaj
n
a
git-gc --auto
:
add
p
re-auto-g
c
hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajn
a
Docum
e
ntation/g
i
t-merge:
d
ocument subtree st
r
a
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
los Vajna
git-gui: U
p
dated
Hungaria
n
translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Va
j
na
Update Hungaria
n
t
ran
s
lation
.
100%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Vajna
I
mprov
e
t
6
029 to chec
k
the r
e
a
l
"su
b
t
ree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
klos Vaj
n
a
Documenta
t
ion/gi
t
s
v
n log:
a
d
d a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documen
t
atio
n
/git-filter-branch: a
d
d a new msg-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
g
it-clean:
h
andl
e
errors if removing files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Documentation/gi
t
-stash: docu
m
e
n
t options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklo
s
Vajna
g
i
t
clone -s do
c
umen
t
at
i
o
n: for
c
e a new paragraph f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klos Vajna
builtin-gc
.
c: guard c
o
n
f
ig pars
e
r f
r
om valu
e
=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
Vajn
a
git rev-parse manp
a
g
e: spe
l
li
n
g
f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull ma
n
page: don't
include -n fro
m
fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
Vajna
git-clone -s: document pro
b
l
ems with gi
t
g
c
--pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos Vajna
I
n
clude
r
ev-lis
t
options in git-
l
og
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
V
ajna
l
s-remote: ad
d
-
t and -h
o
p
t
ions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vaj
n
a
A
d
d u
s
i
ng merge subt
r
ee How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mi
k
lo
s
Vajna
t/t7001:
avoid un
n
ecessar
y
ERE
when
using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vaj
n
a
git-sh-set
u
p:
document g
i
t_editor() an
d
get_author_ident
_
fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mik
l
os Vajna
everyday:
r
eplace 'prun
e
' and 'rep
a
ck' with
'
gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos V
a
jna
Update Hungarian tra
n
slation
.
1
0
0% comp
l
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Inclu
d
e
d
iff options in th
e
git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mikl
o
s Vajna
git-s
e
nd-email: add a new
s
en
d
email
.
to
c
onfigurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
iklos Vajn
a
git s
t
ash
:
docume
n
t apply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-b
u
nd
l
e
:
fix c
o
mman
d
l
i
ne examples
i
n the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Manual: add
a
cha
p
ter for sub
m
odules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hu
n
gar
i
a
n
tr
a
nslatio
n
of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklo
s
V
a
jna
gitweb: new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Va
j
n
a
gitweb
:
prefer g
i
t
_
get_
p
roject_own
e
r(
)
o
v
er get_f
i
le_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklo
s
V
ajna
D
ocument -<n>
f
or git-
f
o
r
mat-
p
atch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree