summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix _XOPEN_SOURCE problem on DragonFlyYONETANI Tomokazu2010-04-021-1/+2
* builtin/commit: remove unnecessary variable definitionMarkus Heidelberg2010-04-021-1/+1
* builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg2010-04-021-2/+2
* Integrate version 3 ciabot scripts into contrib/.Eric Raymond2010-04-023-0/+426
* Makefile: update defaults for modern CygwinEric Blake2010-04-011-10/+12
* Sync with 1.7.0.4Junio C Hamano2010-03-3111-17/+51
|\
| * Git 1.7.0.4v1.7.0.4Junio C Hamano2010-03-313-4/+13
| * Merge branch 'jc/maint-refs-dangling' into maintJunio C Hamano2010-03-312-7/+10
| |\
| * | Documentation: show-ref <pattern>s are optionalHolger Weiß2010-03-311-1/+1
| * | Link against libiconv on IRIXHolger Weiß2010-03-311-0/+2
| * | Don't redefine htonl and ntohl on big-endianHolger Weiß2010-03-311-0/+2
| * | gitweb: git_get_project_config requires only $git_dir, not also $projectJakub Narebski2010-03-311-2/+1
| * | Updated the usage string of git resetJan Stępień2010-03-311-1/+2
| * | Documentation: Clarify support for smart HTTP backendGreg Bacon2010-03-301-1/+1
| * | Windows: fix utime() for read-only filesJohannes Sixt2010-03-301-2/+18
| * | diff: fix textconv error zombiesJohannes Sixt2010-03-301-6/+11
* | | Merge branch 'maint'Junio C Hamano2010-03-292-1/+12
|\ \ \ | |/ /
| * | format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2010-03-292-1/+12
* | | Update draft release notes to 1.7.1Junio C Hamano2010-03-281-9/+10
* | | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-288-18/+168
|\ \ \
| * | | revert: fix tiny memory leak in cherry-pick --ffJonathan Nieder2010-03-201-1/+2
| * | | rebase -i: use new --ff cherry-pick optionChristian Couder2010-03-201-12/+3
| * | | Documentation: describe new cherry-pick --ff optionChristian Couder2010-03-061-1/+5
| * | | cherry-pick: add tests for new --ff optionChristian Couder2010-03-061-0/+98
| * | | revert: add --ff option to allow fast forward when cherry-pickingJunio C Hamano2010-03-061-3/+40
| * | | builtin/merge: make checkout_fast_forward() non staticJunio C Hamano2010-03-062-1/+4
| * | | parse-options: add parse_options_concat() to concat optionsJunio C Hamano2010-03-062-0/+16
* | | | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-282-159/+382
|\ \ \ \
| * | | | notes: rework subcommands and parse optionsStephen Boyd2010-03-122-166/+394
* | | | | Merge branch 'maint'Junio C Hamano2010-03-281-0/+19
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Prepare for 1.7.0.4Junio C Hamano2010-03-282-1/+20
| * | | | Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano2010-03-283-9/+39
| |\ \ \ \
* | | | | | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-282-2/+19
* | | | | | Merge branch 'maint'Junio C Hamano2010-03-284-39/+55
|\ \ \ \ \ \ | |/ / / / /
| * | | | | t9350: fix careless use of "cd"Junio C Hamano2010-03-281-33/+38
| * | | | | difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-282-5/+16
| * | | | | fast-export: don't segfault when marks file cannot be openedSverre Rabbelier2010-03-281-1/+1
* | | | | | imap-send: suppress warning about cleartext password with CRAM-MD5Chris Webb2010-03-281-3/+3
* | | | | | Merge branch 'jh/maint-submodule-status-in-void'Junio C Hamano2010-03-241-1/+3
|\ \ \ \ \ \
| * | | | | | git submodule summary: Handle HEAD as argument when on an unborn branchJens Lehmann2010-03-091-0/+1
| * | | | | | submodule summary: do not fail before the first commitJunio C Hamano2010-03-031-1/+2
* | | | | | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-2425-33/+1366
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | git-notes(1): add a section about the meaning of historyThomas Rast2010-03-121-0/+14
| * | | | | | notes: track whether notes_trees were changed at allThomas Rast2010-03-123-0/+6
| * | | | | | notes: add shorthand --ref to override GIT_NOTES_REFThomas Rast2010-03-122-0/+21
| * | | | | | commit --amend: copy notes to the new commitThomas Rast2010-03-122-0/+18
| * | | | | | rebase: support automatic notes copyingThomas Rast2010-03-125-1/+50
| * | | | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-128-8/+385
| * | | | | | notes: implement 'git notes copy --stdin'Thomas Rast2010-03-125-2/+127
| * | | | | | rebase -i: invoke post-rewrite hookThomas Rast2010-03-122-1/+146