repo.or.cz
/
git.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
m
e
rge-recu
r
sive: move the gl
o
bal
o
buf
to st
r
uct m
e
rge_o
p
ti
o
ns
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-
r
ecu
r
si
v
e: ge
t
ri
d
of
t
h
e
inde
x
_only global
v
ariable
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
m
e
r
g
e-recursive: move
call_depth to struct me
r
ge_options
commit
|
commitdiff
|
tree
2008-09-03
Miklos
Vajna
cherry-p
i
ck/revert: make
direct internal call t
o
merge_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merg
e
: avo
i
d run_comman
d
_v_opt() for recur
s
ive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
mer
g
e-recursiv
e
: introduce merge_option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Stephan
B
eyer
merge
-
rec
u
rsive
.
c: Add mo
r
e generic merge
_
recu
r
sive_generic()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
Split out m
e
r
ge
_
re
c
urs
i
ve() to merge-recursive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C H
a
mano
g
i
tattr
i
butes: -crl
f
is not binary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
git-a
p
ply: Lo
o
sen "match_beginning
"
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
i
o C Hamano
F
i
x example in git-name-rev
d
ocu
m
e
ntation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C
H
aman
o
Merge b
r
anch 'sp/missing-t
h
in-base' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-30
Junio C Haman
o
Me
r
ge
b
ranch
'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Haman
o
Me
r
ge branch
'
af/main
t
-i
n
stall
-
n
o
-
handlink' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
sh
e
ll: do n
o
t play duplicat
e
d definit
i
on games
to
s
hri
n
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Alex Rie
s
en
F
i
x
use of har
d
links in "make
i
n
s
tall"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
a
m
a
no
Merge br
a
n
ch 'np/v
e
rify-pack' into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hama
n
o
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Ar
v
id Lund
git-p4: F
i
x
c
h
e
ckout bug when using --imp
o
rt-local
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
P
a
o
lo Ciarr
o
cchi
tutorial: gen
t
ler
i
llustrat
i
on
o
f A
l
ice/Bob workfl
o
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=for
m
at: respect dat
e
f
o
rmat op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
P
aolo Bon
z
ini
make git-sh
e
ll paranoid a
b
o
ut closed stdin/
s
tdout/
s
t
d
err
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Yann D
i
rson
D
ocumen
t
g
itk
-
-argscmd
flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
Fix '--dirstat'
w
ith cross-directo
r
y re
n
aming
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Bj
ö
rn Steinbrink
for-each-ref: Allow
a trailing slash in the pa
t
terns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Rie
s
en
list_commands: o
n
ly cal
l
git
_
exec_path if it is nee
d
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Allow git help work
w
ithout P
A
TH set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex Riesen
M
a
k
e
m
ain_cmd
s
and o
t
h
e
r_cmds local t
o
builtin-help
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Rie
s
en
Re
m
ove usel
e
s
s memset o
f
stat
i
c command name li
s
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Rie
s
en
R
e
move
calculation
o
f th
e
longest
command n
a
me fr
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Bran
d
on Casey
d
i
r
.
c: Avoi
d
c99 array in
i
tializatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Matthi
a
s
K
e
s
tenholz
bas
h
-completi
o
n: Add all su
b
module sub
c
omma
n
d
s to th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Mer
g
e bra
n
ch 'mv/me
r
ge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Jun
i
o C Hamano
Mer
g
e bran
c
h 'ml/
s
u
bmodule'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hamano
Merge
b
ra
n
c
h
'am/cherr
y
-pic
k
-r
e
rere'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
b
ranch 'jc/a
d
d-addrem
o
ve'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'np/ver
i
fy-pac
k
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Merge branch 'da/sub
m
odule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hamano
Merge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ctype
.
c: pr
o
tect tiny C
prepr
o
c
es
s
or
constants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
L
inus Tor
v
alds
i
n
d
ex
-
pack:
be careful
after fixing up
t
he heade
r
/footer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Simon H
a
usman
n
Make it possible
to abort the s
u
bmi
s
sio
n
of a change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Me
r
g
e
b
ranch
'
a
f
/maint-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Ha
m
ano
Merge branch 'j
c
/no-s
l
im-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
J
e
ff K
i
ng
format-patch: use default
diff format even w
i
th patch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn Thái
N
gọc D
u
y
i
n
d
ex-pack: setu
p
g
i
t repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Sup
p
re
s
s
som
e
bash redirec
t
ion error
messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Fi
x
a warn
i
ng (on cygwin) to allow -Werror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Fä
r
b
e
r
Makefil
e
: always pro
v
ide a fallback
w
hen hardlinks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
daemo
n
.
c:
m
inor style
f
ixup
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-su
b
module: add "sync" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C
Ham
a
no
Revert "Build-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff
K
i
ng
Fix "git log
-
i
--
g
rep"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Tommi
V
i
rtanen
I
nstall g
i
t-she
l
l in bind
i
r, too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
M
e
rge br
a
nch 'j
c
/n
o
-sl
i
m
-shel
l
'
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hamano
Merg
e
branch 'mai
n
t' to s
y
nc
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
GIT 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
/
m
a
int-combine-diff
-
f
i
x
' into maint
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C
Hamano
Merg
e
b
ranc
h
'mv/maint-merge-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
M
ark Levedahl
git-submodule - Use "ge
t
_de
f
ault_re
m
o
t
e" fr
o
m gi
t
-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jo
n
atha
n
Nieder
Documentation
:
clarif
y
pager con
f
igur
a
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonat
h
an N
i
eder
D
ocumentation: clar
i
fy
p
ager
.
<
c
md>
config
u
r
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
S
i
mo
n
Hausmann
Clean
up the git-p4
documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alexander G
a
vrilov
Re
s
pect co
r
e
.
autocrlf in combined diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vaj
n
a
Mak
e
file:
e
nable SNPRINTF_RE
T
URNS_BOGUS f
o
r
H
P
-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
io C Hamano
t7606:
f
ix
custom merge test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio
C
Hamano
me
r
ge: fix numerus
b
ugs aro
u
nd "trivial merge" a
r
ea
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
unpa
c
k_
t
rees(): protect
th
e
handcrafted
i
n-core index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
T
or Arvid
L
und
git-p4: Fi
x
one-liner in
p4_write
_
pipe function
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
avid A
g
u
i
l
ar
git-submodule:
r
eplace duplicated code
w
ith a mod
u
le_list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Nic
o
las
P
itre
discard revindex da
t
a wh
e
n pack list changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
git-merge documentatio
n
: more details
about resolving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
A
l
ex Ri
e
sen
Extend "checkout --t
r
ack" DWIM to
support more ca
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan
del Strother
Revert "Convert
o
u
tp
u
t messages
in m
e
rge-recurs
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Completio
n
: add missing
'=' fo
r
'diff
--diff-filt
e
r'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio C
Hamano
templates/Makefi
l
e
:
instal
l
is
un
n
e
cessa
r
y, just use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Brandon
Casey
remote
.
c: add a fun
c
tion for deletin
g
a refspec array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
S
ixt
filter-branch: Grok special
c
haracters in
t
ag
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Joh
a
nn
e
s Schind
e
lin
tes
t
-lib: do not remove trash
_
director
y
if called
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
P
a
o
l
o B
o
nzini
provi
d
e more e
r
rors
fo
r
t
h
e "merge into
e
mpty head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
S
h
awn O
.
P
earce
Make reflo
g
query '@
{
1219
1
88291}' act as '@{2008
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Neil R
o
ber
t
s
config
.
m
a
k
.
i
n
: Pas
s
on LDFLAGS from configure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
git-submodul
e
.
sh - Remove trailing / from U
R
L if found
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git
hel
p
help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
unio
C H
a
mano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
compat/snprintf
.
c
: h
a
ndle snpri
n
tf's
that
a
l
way
s
retu
r
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Johan
Herl
a
n
d
Teach
"git
d
i
f
f
-p"
H
TML
f
uncna
m
e p
a
tter
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
T
e
ach "git
d
iff -p" Python
f
un
c
name patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
E
r
ic Wong
g
it-svn:
f
i
x
dcommit to
urls with embedded usernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
M
e
rge branch 'ml/submodule-
f
o
r
each
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merg
e
branch
'
pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Haman
o
Merge branch '
s
b/commit
-
tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge bra
n
c
h 'pb/ref
l
og-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Me
r
ge b
r
an
c
h 'jc/add-st
o
p-at
-
symlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e bra
n
ch 'kh/di
f
f-tree'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merg
e
bra
n
ch 'm
g
/count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Haman
o
Merge branch 'mz/push-
v
erbos
e
'
commit
|
commitdiff
|
tree
next