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
merge-recursive: move the global obuf to struct merge_options
2008-09-05
Miklos Vajn
a
merge
-
recursive: mo
v
e the global obuf to struct
m
erge_options
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
merge-recursive
:
g
et rid of the
i
ndex_on
l
y
global var
i
able
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
los Vajna
merg
e
-recu
r
sive: move cal
l
_de
p
t
h to struct merge_o
p
t
i
o
ns
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
a
jna
che
r
ry-
p
i
c
k/revert: make dire
c
t internal
call to merge_tree
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
a
j
na
builtin-
m
e
r
ge: avoid run_command_v_opt
(
) f
o
r recursi
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
mer
g
e-
r
e
cursive: introduce merge_op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Step
h
an Beye
r
merge-recursive
.
c: Add
more
generic m
e
rg
e
_recursive_gen
e
ric()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
Spli
t
o
u
t merge
_
recurs
i
ve() to mer
g
e
-
re
c
ur
s
i
v
e
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio
C
H
a
m
a
no
M
erge bra
n
c
h
'maint
'
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Hamano
gitattributes: -crlf is no
t
binary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
gi
t
-apply: Loosen "match_beginning" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Ha
m
ano
Fix exa
m
p
l
e
i
n
git-
n
ame-rev documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C
H
amano
Merge b
r
a
nc
h
'sp/mis
s
ing-th
i
n-ba
s
e' into maint
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
H
aman
o
Merge
b
ranch 'sb/d
a
e
m
o
n'
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
Merge br
a
nch 'af/maint
-
install-no-handlink' into
m
aint
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Hama
n
o
shell: do not p
l
ay duplicated def
i
nit
i
o
n
game
s
t
o shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
A
l
ex R
i
esen
Fix use of
har
d
l
inks in "make
i
n
st
a
ll"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
Mer
g
e
branch
'
np/verify-pa
c
k' into
maint
commit
|
commitdiff
|
tree
2008-08-29
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
T
o
r A
r
vid
L
u
n
d
gi
t
-p4: Fix checkout bug when using --import-local
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
P
a
olo Ci
a
r
rocchi
tutorial: gent
l
er illustration o
f
Alice
/
Bob workflow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff Kin
g
pretty=
f
orm
a
t: respect date form
a
t options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
make git-shel
l
paranoid about close
d
std
i
n/stdout
/
stderr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
Documen
t
git
k
--argscmd flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Linus
Torval
d
s
Fix '--dirstat' with cross-director
y
renaming
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinb
r
ink
for-eac
h
-ref: Allow a
t
railing slash in the patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
list_commands
:
only call git
_
e
x
ec_path if it is need
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riese
n
A
l
lo
w
git help w
o
rk witho
u
t PATH set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex R
i
esen
M
ake main_cmds
a
n
d other_cmds local to built
i
n-help
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex
Ri
e
sen
Re
m
ove usele
s
s
memset of stat
i
c co
m
mand name lists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex
R
iesen
Remove calc
u
l
a
tion of the
lo
n
gest
c
ommand nam
e
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
B
r
ando
n
Casey
d
ir
.
c: Avoid c99
arr
a
y initialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Matthias Kestenholz
bash-c
o
mple
t
i
on: Add all submodul
e
su
b
commands to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-28
Junio C H
a
mano
Merge branch 'mv/
m
erge-c
u
stom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hama
n
o
Merge br
a
nch 'ml
/
s
u
b
m
odule'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Hamano
Merge branch 'am/cherry-pick-rere
r
e'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
am
a
no
Merge branch 'jc/a
d
d-addremo
v
e'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C
Hamano
Merge
b
r
anc
h
'
np/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
branch '
d
a/submo
d
u
l
e-sync'
commit
|
commitdiff
|
tree
2008-08-27
J
unio
C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hamano
ctype
.
c
:
protect
t
iny
C prepro
c
es
s
or constants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Lin
u
s
Torvalds
index-pack:
b
e c
a
r
eful after fi
x
ing
u
p
t
he h
e
ader/footer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Sim
o
n Hausmann
Ma
k
e i
t
pos
s
ib
l
e to abort
the submission
of a cha
n
ge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'af/maint
-
install-no-
h
andlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ham
a
no
Merge bran
c
h 'jc/no-slim-
s
hell'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Ham
a
no
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
format-patch: use defaul
t
diff format e
v
en with patch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ng
u
yễn Thái Ngọc Duy
in
d
e
x
-
p
a
ck: set
u
p
git repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Suppress some bas
h
redirection er
r
or messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsa
y
Jones
Fi
x
a warning
(
on
cygwin) to all
o
w -W
e
r
r
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Färber
M
a
kefile: always provide a fallback when ha
r
d
li
n
ks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
J
unio C
H
amano
daemon
.
c: minor s
t
y
l
e fixup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
Aguila
r
git
-
submod
u
le: add "sync" c
o
mmand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Juni
o
C Hamano
Revert "Build-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "git
l
og -i
-
-
g
r
ep"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Virta
n
en
Install git-shell
in bindir, too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Haman
o
M
e
rg
e
branch 'jc
/
no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Ham
a
n
o
M
e
rge
b
ranch 'maint' to s
y
nc
w
ith
1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
G
I
T 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'ag/maint-combine-diff-fix'
into
maint
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Ha
m
ano
Mer
g
e
b
r
anch 'mv/
m
aint-
m
erge-fix'
i
nto maint
commit
|
commitdiff
|
tree
2008-08-24
Mark Leved
a
hl
g
it-
s
ubmodule - Use
"
get_def
a
ult_remote" fr
o
m
g
it-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
onathan Nieder
Documentatio
n
: clarify pager configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
D
o
cumentat
i
o
n
: clarify pager
.
<cmd> configura
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
S
i
mon Hau
s
mann
Clean up the git-
p
4
doc
u
m
e
ntat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alexande
r
Gavrilov
R
espect core
.
autocrlf
in combine
d
d
iff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
M
ikl
o
s Vaj
n
a
Ma
k
efile: en
a
bl
e
SNPRINTF
_
R
ETU
R
N
S_BOG
U
S fo
r
HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C
Hamano
t7606: fix custom merg
e
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C
Hamano
Merge br
a
n
ch
'
maint
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
a
n
o
merge: f
i
x numerus b
u
g
s
around "
t
r
i
vial me
r
ge
"
ar
e
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C
Haman
o
unp
a
c
k
_trees(): protec
t
t
h
e han
d
crafted in-core index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid Lund
git-p4: Fix one-liner in p
4
_
write_pi
p
e function
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-su
b
module: replace
d
upl
i
cated
c
o
d
e with a mod
u
le_
l
ist
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas Pit
r
e
dis
c
a
rd revindex da
t
a when
p
a
c
k list changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
git-merge do
c
umentation: m
o
re details about resolv
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riese
n
Extend "checkout --track" DWIM to su
p
por
t
more cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan del Strothe
r
Re
v
ert "Convert out
p
ut m
e
ssages in
m
e
r
ge-recursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Eric R
a
ible
Completio
n
: a
d
d missing '=' for 'diff --dif
f
-filter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Ha
m
a
n
o
tem
p
lates
/
Makefile
:
install
i
s unne
c
ess
a
ry,
just
use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Brandon C
a
sey
remote
.
c: ad
d
a f
u
nction for de
l
eting
a
refspec a
r
ray
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
S
ixt
filter-
b
ranc
h
:
Grok speci
a
l characters
i
n
t
a
g names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
J
o
hannes Schindelin
test-lib: do not r
e
m
ove tras
h
_
dire
c
tory if
c
alled with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Paolo B
o
nzini
p
r
ovi
d
e mo
r
e e
r
r
ors for
t
he "me
r
ge i
n
to empty head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Sha
w
n O
.
Pearce
M
a
k
e
ref
l
og quer
y
'@{12191
8
8
291}' act a
s
'@{2008
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
N
eil R
o
bert
s
c
onfi
g
.
ma
k
.
in: Pa
s
s on LDFL
A
GS from configu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Mark Leve
d
a
hl
git-submo
d
ule
.
sh - Remove trailing / from
U
R
L if found
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
M
iklo
s
V
ajna
F
i
x 'g
i
t help help
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon
C
asey
c
o
m
pat
/
snprint
f
.
c
:
handle snprintf's t
h
at always re
t
u
r
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han
Herland
Teach "g
i
t
dif
f
-
p
" HTML fu
n
c
name p
a
tterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
K
i
rill Smelkov
Teac
h
"
g
it diff -p" Pytho
n
funcn
a
me patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
git
-
s
v
n: fix dcommit
t
o
u
r
ls
w
ith e
m
bedded
u
sernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
ge br
a
n
c
h 'ml/s
u
bmodule-forea
c
h
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio
C
Hamano
Merge br
a
nch 'pm/log-exi
t
-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
M
e
rge branch 'sb/commit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Mer
g
e branch 'pb/reflog-dw
i
m'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
branch 'jc/add-stop
-
at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Merge br
a
nc
h
'kh/
d
iff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
n
o
Merge
branch 'mg/count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erg
e
branch 'mz/push-verbose'
commit
|
commitdiff
|
tree
next