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-recursive: get rid of virtual_id
2008-09-05
Miklos Vajna
merge-recu
r
siv
e
: get r
i
d o
f
vir
t
u
a
l
_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-recursive
:
move current_{file,directory
}
_set
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
mer
g
e-recursive:
m
ove the globa
l
o
b
u
f
to
struct merge_options
commit
|
commitdiff
|
tree
2008-09-05
M
i
klo
s
Vajna
merge-recursive: g
e
t rid of
t
he
i
n
d
e
x
_
o
nly global variable
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
jna
merg
e
-
recu
r
sive: move call_
d
epth to struct mer
g
e_options
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jn
a
cherry-pick/rever
t
: make direc
t
interna
l
call to merge_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
bui
l
tin-merge: avoid run_command
_
v_
o
pt() fo
r
recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
merge-recur
s
i
ve: introduce merge_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan
Beyer
m
e
rge-rec
u
rsiv
e
.
c:
A
d
d more
generic merge
_
recur
s
ive
_
generi
c
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
S
p
lit out m
e
rge_re
c
ursive()
to merge-recu
r
s
ive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
i
o
C Ham
a
n
o
gitattributes: -crlf is
n
ot
b
inary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
git
-
apply: Loosen "m
a
tch_beg
i
nn
i
ng" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C
H
a
mano
Fix example in git-name-rev documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branc
h
'sp
/
missing-thin-base' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
H
amano
Merge b
r
a
n
c
h
'sb
/
daemon'
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio
C Hamano
Merge
b
ranch 'af
/
main
t
-insta
l
l-no-handlink' into maint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
sh
e
ll: do n
o
t play dup
l
icated definitio
n
games to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Al
e
x
R
iesen
Fix use of har
d
links in
"ma
k
e i
n
stall"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
Me
r
ge branch 'n
p
/verify-pack'
i
nto
maint
commit
|
commitdiff
|
tree
2008-08-29
Ju
n
io C Hama
n
o
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2008-08-29
T
or Arvid Lund
git-
p
4: Fix
checkout bug when u
s
ing --im
p
ort-loc
a
l
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarrocc
h
i
tutorial: gentler illustration of Alic
e
/Bob w
o
rkflo
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=format: respect date format options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
ma
k
e
git-s
h
e
l
l
p
a
r
a
noi
d
a
b
out closed stdin/stdo
u
t/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
D
o
c
u
men
t
g
itk --argscmd fla
g
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvald
s
Fix
'
-
-dirstat' with cross-directory renami
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
B
j
ö
rn
S
tein
b
rink
fo
r
-
each-ref
:
Allow a trailing
slash in the p
a
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
list
_
commands: only c
a
ll git_exec_path
i
f it
is ne
e
ded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Rie
s
e
n
A
llow git help wor
k
wi
t
h
out PATH
set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
M
a
ke mai
n
_
cmds and other_cmds local
t
o builtin-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Riesen
Remove
usel
e
ss
m
emset o
f
static command name lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remov
e
ca
l
culation
of the longest command
name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Bran
d
on Casey
dir
.
c: Avoid c99 array
i
n
i
t
i
aliz
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matthias Kes
t
en
h
olz
b
a
sh-completion: Add all submodule subcommands t
o
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merg
e
b
r
a
nch 'mv/m
e
r
ge-cu
s
tom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Haman
o
M
erge branc
h
'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merg
e
branch
'am/cherry-pick-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch
'jc/add-addremove
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
Merge
branch 'np/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C
H
a
man
o
Merge b
r
anch 'da/submodule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
ctype
.
c: protect tiny C prep
r
oces
s
o
r
c
o
nstants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Lin
u
s Torv
a
ld
s
index-pack: be careful after fixing up th
e
header/foo
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
M
a
ke it
p
ossibl
e
to abort the subm
i
s
sion of a change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hama
n
o
Merge
branch '
a
f/main
t
-ins
t
all-no-h
a
ndlink
'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C H
a
mano
Merge bra
n
ch 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
format-pa
t
ch: use default di
f
f format eve
n
wi
t
h patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ng
u
yễn Thái
N
gọc Duy
i
n
dex-pa
c
k: setup git repo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Sup
p
res
s
some bas
h
redirection e
r
r
o
r messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay J
o
nes
Fix a
w
arn
i
ng
(on cygwin
)
to a
l
low -Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Andr
e
as Färber
Makefile:
alway
s
provide
a
fall
b
a
ck
w
hen har
d
l
i
nks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
u
nio C
H
am
a
no
daemon
.
c: m
i
nor style 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 Aguilar
git-submodule: add "sync" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
Rev
e
rt "Build-in "git-she
l
l""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "git
l
og -i -
-
grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Virtanen
Instal
l
g
i
t
-
shell i
n
bi
n
dir
,
too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge
b
ranch 'jc/
n
o-sli
m
-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
Merge bran
c
h
'maint' to syn
c
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hama
n
o
M
e
r
ge branch '
a
g/maint-combine-dif
f
-fix' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
Merge bra
n
c
h 'mv/mai
n
t-mer
g
e-fix' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
M
a
rk
L
evedahl
gi
t
-submod
u
le -
U
se "get_default_remote" from
g
it-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonatha
n
Nieder
Documentation:
cla
r
ify pa
g
e
r
configurat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Documentation: clar
i
fy
p
ager
.
<cmd
>
configur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
Clean up the git-p4 d
o
c
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavrilov
R
e
s
pect core
.
autocrlf in c
o
mbin
e
d diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos
Vajna
M
a
kefile: enable SNPRINTF
_
RET
U
RNS_BOGUS for HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
ni
o
C
H
amano
t7606: fix c
u
stom merge tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
am
a
n
o
Merge b
r
an
c
h 'maint
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Ha
m
a
no
merge:
f
i
x
nu
m
erus bugs around
"tri
v
ial
merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpac
k
_trees(): protec
t
the handcraf
t
e
d in-core
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid Lu
n
d
git-p4: Fix one-liner
i
n p4_wr
i
te_pi
p
e function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
l
a
r
git-submodule: rep
l
ace duplicated code with a modu
l
e_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Ni
c
olas
P
itr
e
discard
revindex data when pa
c
k list
c
h
a
nges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
n Hensge
n
git
-
merge
d
ocumentation: more de
t
a
i
ls about resolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
A
l
e
x Rie
s
en
Ext
e
nd
"chec
k
out --track" DW
I
M t
o
support mor
e
cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jona
t
han del Strother
Revert "Co
n
v
e
r
t output messages in merge-
r
ecursiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
E
ric Raible
Complet
i
on: add missing
'
=' f
o
r
'd
i
ff --diff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
templates/Makefile:
i
nstall is unnecessary, ju
s
t u
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brandon Casey
rem
o
te
.
c: add a
f
unction for de
l
eting a refspec ar
r
ay
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sixt
filter-branch: Grok specia
l
characters
in tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Schin
d
elin
t
e
st-lib
:
do n
o
t re
m
o
ve trash_di
r
ecto
r
y if called w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo
Bonzini
p
rov
i
de more errors for
th
e
"merge i
n
to e
m
pty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn
O
.
Pe
a
rc
e
Make reflog query '@{12191
8
8291}'
a
ct as
'
@{200
8
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Ne
i
l Roberts
config
.
ma
k
.
i
n
:
Pass on LDFL
A
GS from confi
g
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Ma
r
k Levedahl
g
i
t
-
s
u
bmod
u
le
.
s
h -
Remov
e
t
raili
n
g / from
U
RL if
found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mikl
o
s Vajn
a
Fix 'git
h
elp help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
B
r
ando
n
Ca
s
ey
compat/snprintf
.
c: handle snpri
n
tf's tha
t
always
r
eturn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jo
h
an Herland
Teach "git
d
iff
-p" HTM
L
funcna
m
e
p
atte
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
K
i
rill Smelk
o
v
Teach "git diff -p" Pyth
o
n fun
c
nam
e
patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
g
i
t-
s
vn:
f
ix
d
c
o
mmit to u
r
ls with embedded
u
sernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
unio
C H
a
mano
Mer
g
e
br
a
nch 'ml/s
u
b
module-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Me
r
ge branch 'pm/log-exi
t
-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
ge
b
r
anch
'
sb/commit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o C H
a
mano
M
erge branc
h
'pb/reflog-d
w
i
m
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hama
n
o
Merge
branch 'jc/add-
s
top-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Ham
a
no
Merg
e
branc
h
'kh/diff-
t
ree'
commit
|
commitdiff
|
tree
next