aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* wt-status: collect ignored filesJunio C Hamano2010-04-10
* wt-status: plug memory leak while collecting untracked filesJunio C Hamano2010-04-10
* wt-status: remove unused workdir_untracked memberJunio C Hamano2010-04-10
* Merge branch 'maint'Junio C Hamano2010-04-09
|\
| * Let check_preimage() use memset() to initialize "struct checkout"Jens Lehmann2010-04-09
| * Merge branch 'ef/maint-empty-commit-log' into maintJunio C Hamano2010-04-09
| |\
| * \ Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2010-04-09
| |\ \
| * \ \ Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maintJunio C Hamano2010-04-09
| |\ \ \
| * \ \ \ Merge branch 'mg/maint-send-email-lazy-editor' into maintJunio C Hamano2010-04-09
| |\ \ \ \
| * \ \ \ \ Merge branch 'rr/imap-send-unconfuse-from-line' into maintJunio C Hamano2010-04-09
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rb/maint-python-path' into maintJunio C Hamano2010-04-09
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'gh/maint-stash-show-error-message' into maintJunio C Hamano2010-04-09
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mg/mailmap-update' into maintJunio C Hamano2010-04-09
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bc/maint-daemon-sans-ss-family' into maintJunio C Hamano2010-04-09
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch/push: fix usage stringsTay Ray Chuan2010-04-09
* | | | | | | | | | | Merge branch 'rc/maint-reflog-msg-for-forced-branch'Junio C Hamano2010-04-09
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch: say "Reset to" in reflog entries for 'git branch -f' operationsTay Ray Chuan2010-04-09
* | | | | | | | | | | | Merge early parts of jk/cached-textconvJunio C Hamano2010-04-08
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff.c: work around pointer constness warningsJunio C Hamano2010-04-08
| * | | | | | | | | | | | fix textconv leak in emit_rewrite_diffJeff King2010-04-01
| * | | | | | | | | | | | fix const-correctness of write_sha1_fileJeff King2010-04-01
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | docs: clarify "branch -l"Jeff King2010-04-08
* | | | | | | | | | | | | Merge branch 'mg/notes-reflog'Junio C Hamano2010-04-07
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refs.c: Write reflogs for notes just like for branch headsMichael J Gruber2010-03-29
| * | | | | | | | | | | | | t3301-notes: Test the creation of reflog entriesMichael J Gruber2010-03-29
* | | | | | | | | | | | | | Merge branch 'jn/mailinfo-scissors'Junio C Hamano2010-04-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Teach mailinfo %< as an alternative scissors markJonathan Nieder2010-04-04
* | | | | | | | | | | | | | | fix typos and grammar in 1.7.1 draft release notesJeff King2010-04-07
* | | | | | | | | | | | | | | notes.h: declare bit field as unsigned to silence compiler complaintsBrandon Casey2010-04-06
* | | | | | | | | | | | | | | Git 1.7.1-rc0v1.7.1-rc0Junio C Hamano2010-04-06
* | | | | | | | | | | | | | | Merge branch 'da/maint-python-startup'Junio C Hamano2010-04-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Makefile: Remove usage of deprecated Python "has_key" methodDavid Aguilar2010-03-28
* | | | | | | | | | | | | | | | Merge branch 'ic/bash-completion-rpm'Junio C Hamano2010-04-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | RPM spec: include bash completion supportIan Ward Comfort2010-03-29
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sb/fmt-merge-msg'Junio C Hamano2010-04-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fmt-merge-msg: hide summary optionStephen Boyd2010-03-24
| * | | | | | | | | | | | | | | | fmt-merge-msg: remove custom string_list implementationStephen Boyd2010-03-24
| * | | | | | | | | | | | | | | | string-list: add unsorted_string_list_lookup()Stephen Boyd2010-03-24
| * | | | | | | | | | | | | | | | fmt-merge-msg: use pretty.c routinesStephen Boyd2010-03-24
| * | | | | | | | | | | | | | | | t6200: test fmt-merge-msg moreStephen Boyd2010-03-24
| * | | | | | | | | | | | | | | | t6200: modernize with test_tickStephen Boyd2010-03-24
| * | | | | | | | | | | | | | | | fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-24
* | | | | | | | | | | | | | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-24
* | | | | | | | | | | | | | | | | Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2010-04-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | rev-list: fix --pretty=oneline with empty messageErik Faye-Lund2010-03-21
* | | | | | | | | | | | | | | | | Merge branch 'sg/bash-completion'Junio C Hamano2010-04-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | bash: completion for gitk aliasesSZEDER Gábor2010-02-24
| * | | | | | | | | | | | | | | | | bash: support user-supplied completion scripts for aliasesSZEDER Gábor2010-02-24